diff options
| author | jkh <jkh@FreeBSD.org> | 2000-09-16 21:15:21 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 2000-09-16 21:15:21 +0000 |
| commit | 9ba56a7262946b78820a538fd973433ddbeea623 (patch) | |
| tree | 7d23922930df61a323a9556f42285beebcaef693 /usr.sbin/sysinstall | |
| parent | 3383919e3fcc70f38d021287ac97515f03c3c9cb (diff) | |
| download | FreeBSD-src-9ba56a7262946b78820a538fd973433ddbeea623.zip FreeBSD-src-9ba56a7262946b78820a538fd973433ddbeea623.tar.gz | |
Enable crypto by default with "canned" distributions (it can still
be deselected or simply not chosen in a custom install).
Diffstat (limited to 'usr.sbin/sysinstall')
| -rw-r--r-- | usr.sbin/sysinstall/dist.c | 2 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/dist.h | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c index 7920dd8..61974c8d 100644 --- a/usr.sbin/sysinstall/dist.c +++ b/usr.sbin/sysinstall/dist.c @@ -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) diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h index c873c38..edf00c9 100644 --- a/usr.sbin/sysinstall/dist.h +++ b/usr.sbin/sysinstall/dist.h @@ -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 |
