d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable crypto by default with "canned" distributions (it can still

Browse Source 
be deselected or simply not chosen in a custom install).
This commit is contained in:
Jordan K. Hubbard 2000-09-16 21:15:21 +00:00
parent 818c39998e
commit f295f79cb9
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/sysinstall/dist.c
View File

@ -210,6 +210,8 @@ distVerifyFlags(void)
CRYPTODists |= DIST_CRYPTO_CRYPTO;
Dists |= DIST_CRYPTO;
}
else if ((Dists & DIST_CRYPTO) && !CRYPTODists)
CRYPTODists |= DIST_CRYPTO_CRYPTO;
if (XF86Dists & DIST_XF86_SET)
XF86ServerDists |= DIST_XF86_SERVER_VGA16;
if (XF86ServerDists)

8
release/sysinstall/dist.h
View File

@ -27,11 +27,11 @@
#define DIST_ALL 0x3FFFF
/* Canned distribution sets */
#define _DIST_DEVELOPER \
(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_PROFLIBS | DIST_INFO | DIST_SRC )
#define _DIST_USER \
(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT )
( DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_CRYPTO )
#define _DIST_DEVELOPER \
( _DIST_USER | DIST_PROFLIBS | DIST_INFO | DIST_SRC )
/* Subtypes for CRYPTO distribution */
#define DIST_CRYPTO_CRYPTO 0x0001

2
usr.sbin/sysinstall/dist.c
View File

@ -210,6 +210,8 @@ distVerifyFlags(void)
CRYPTODists |= DIST_CRYPTO_CRYPTO;
Dists |= DIST_CRYPTO;
}
else if ((Dists & DIST_CRYPTO) && !CRYPTODists)
CRYPTODists |= DIST_CRYPTO_CRYPTO;
if (XF86Dists & DIST_XF86_SET)
XF86ServerDists |= DIST_XF86_SERVER_VGA16;
if (XF86ServerDists)

8
usr.sbin/sysinstall/dist.h
View File

@ -27,11 +27,11 @@
#define DIST_ALL 0x3FFFF
/* Canned distribution sets */
#define _DIST_DEVELOPER \
(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_PROFLIBS | DIST_INFO | DIST_SRC )
#define _DIST_USER \
(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT )
( DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_CRYPTO )
#define _DIST_DEVELOPER \
( _DIST_USER | DIST_PROFLIBS | DIST_INFO | DIST_SRC )
/* Subtypes for CRYPTO distribution */
#define DIST_CRYPTO_CRYPTO 0x0001