diff options
| author | jkh <jkh@FreeBSD.org> | 1996-05-16 13:30:24 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1996-05-16 13:30:24 +0000 |
| commit | 9a98e874982036a7da66d099584e6449a0f1076b (patch) | |
| tree | f5075adad04b74e3f03b09ab75da5fa02e43ef42 /usr.sbin | |
| parent | 7560ec91cb3ab69ac43c0b950636e8fb5cd679a8 (diff) | |
| download | FreeBSD-src-9a98e874982036a7da66d099584e6449a0f1076b.zip FreeBSD-src-9a98e874982036a7da66d099584e6449a0f1076b.tar.gz | |
Get X user and X developer distributions checked correctly again in menus.
Oh yeah, last commit also fixed (I hope) the /etc/sysinstall not being
written on Custom installation problem.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/sade/menus.c | 6 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/dist.c | 4 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/menus.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index ce452ce..11989a0 100644 --- a/usr.sbin/sade/menus.c +++ b/usr.sbin/sade/menus.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: menus.c,v 1.60 1996/05/09 09:42:15 jkh Exp $ + * $Id: menus.c,v 1.61 1996/05/16 11:47:38 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -131,7 +131,7 @@ checkDistDeveloper(dialogMenuItem *self) static int checkDistXDeveloper(dialogMenuItem *self) { - return (Dists == (_DIST_DEVELOPER | DIST_XF86) && SrcDists == DIST_SRC_ALL); + return (Dists == (_DIST_DEVELOPER | DIST_XF86 | DIST_COMPAT21 ) && SrcDists == DIST_SRC_ALL); } static int @@ -149,7 +149,7 @@ checkDistUser(dialogMenuItem *self) static int checkDistXUser(dialogMenuItem *self) { - return (Dists == (_DIST_USER | DIST_XF86)); + return (Dists == (_DIST_USER | DIST_XF86 | DIST_COMPAT21)); } static int diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c index c778b54..a596501 100644 --- a/usr.sbin/sysinstall/dist.c +++ b/usr.sbin/sysinstall/dist.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: dist.c,v 1.49 1996/05/01 08:42:40 jkh Exp $ + * $Id: dist.c,v 1.50 1996/05/01 08:50:00 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -183,7 +183,7 @@ int distSetXDeveloper(dialogMenuItem *self) { distReset(NULL); - Dists = _DIST_DEVELOPER | DIST_XF86; + Dists = _DIST_DEVELOPER; SrcDists = DIST_SRC_ALL; XF86Dists = DIST_XF86_BIN | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS; XF86ServerDists = DIST_XF86_SERVER_SVGA; diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index ce452ce..11989a0 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/menus.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: menus.c,v 1.60 1996/05/09 09:42:15 jkh Exp $ + * $Id: menus.c,v 1.61 1996/05/16 11:47:38 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -131,7 +131,7 @@ checkDistDeveloper(dialogMenuItem *self) static int checkDistXDeveloper(dialogMenuItem *self) { - return (Dists == (_DIST_DEVELOPER | DIST_XF86) && SrcDists == DIST_SRC_ALL); + return (Dists == (_DIST_DEVELOPER | DIST_XF86 | DIST_COMPAT21 ) && SrcDists == DIST_SRC_ALL); } static int @@ -149,7 +149,7 @@ checkDistUser(dialogMenuItem *self) static int checkDistXUser(dialogMenuItem *self) { - return (Dists == (_DIST_USER | DIST_XF86)); + return (Dists == (_DIST_USER | DIST_XF86 | DIST_COMPAT21)); } static int |
