diff options
| -rw-r--r-- | release/sysinstall/dist.c | 2 | ||||
| -rw-r--r-- | release/sysinstall/dist.h | 8 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/dist.c | 2 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/dist.h | 8 |
4 files changed, 12 insertions, 8 deletions
diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c index 7920dd8eb08a..61974c8d06a0 100644 --- a/release/sysinstall/dist.c +++ b/release/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/release/sysinstall/dist.h b/release/sysinstall/dist.h index c873c388a79e..edf00c9d072a 100644 --- a/release/sysinstall/dist.h +++ b/release/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 diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c index 7920dd8eb08a..61974c8d06a0 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 c873c388a79e..edf00c9d072a 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 |