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

Get X user and X developer distributions checked correctly again in menus.

Browse Source 
Oh yeah, last commit also fixed (I hope) the /etc/sysinstall not being
written on Custom installation problem.
This commit is contained in:
Jordan K. Hubbard 1996-05-16 13:30:24 +00:00
parent 16185b823a
commit cdb7618ef9
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
release/sysinstall/dist.c
View File

@ -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;

6
release/sysinstall/menus.c
View File

@ -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

6
usr.sbin/sade/menus.c
View File

@ -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

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

@ -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;

6
usr.sbin/sysinstall/menus.c
View File

@ -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