Sync with 2.1-stable (I commited my changes there first by mistake due to

an errant CVS tag file).
This commit is contained in:
Jordan K. Hubbard 1996-06-29 02:53:09 +00:00
parent 16805608c8
commit d08b90a2c6
11 changed files with 26 additions and 83 deletions

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: config.c,v 1.38 1996/06/25 04:28:20 jkh Exp $
* $Id: config.c,v 1.39 1996/06/29 02:22:39 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -578,22 +578,6 @@ configGated(dialogMenuItem *self)
return ret;
}
/* Load novell client/server package */
int
configNovell(dialogMenuItem *self)
{
int ret = DITEM_SUCCESS;
if (variable_get(VAR_NOVELL))
variable_unset(VAR_NOVELL);
else {
ret = package_add("commerce/netcon/bsd60");
if (DITEM_STATUS(ret) == DITEM_SUCCESS)
variable_set2(VAR_NOVELL, "YES");
}
return ret;
}
/* Load pcnfsd package */
int
configPCNFSD(dialogMenuItem *self)

View file

@ -24,7 +24,7 @@
(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_COMPAT1X | DIST_COMPAT20 | DIST_COMPAT21)
(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_COMPAT1X | DIST_COMPAT20)
#define _DIST_XDEV \
(DIST_XF86_BIN | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS)

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.73 1996/06/27 07:03:44 jkh Exp $
* $Id: menus.c,v 1.74 1996/06/29 02:22:44 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -1037,8 +1037,6 @@ aspects of your system's network configuration.",
dmenuVarCheck, dmenuToggleVariable, NULL, "gateway=YES" },
{ "Gated", "This machine wants to run gated instead of routed",
dmenuVarCheck, configGated, NULL, "gated" },
{ "Novell", "Install the Novell client/server demo package",
dmenuVarCheck, configNovell, NULL, "novell" },
{ "Ntpdate", "Select a clock-syncronization server",
dmenuVarCheck, dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']', (int)"ntpdate" },
{ "Routed", "Set flags for routed (default: -q)",

View file

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
* $Id: sysinstall.h,v 1.64 1996/06/17 21:48:33 jkh Exp $
* $Id: sysinstall.h,v 1.42.2.58 1996/06/17 21:57:54 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -117,7 +117,6 @@
#define VAR_NFS_SECURE "nfsSecure"
#define VAR_NFS_SERVER "nfs_server"
#define VAR_NO_CONFIRM "noConfirm"
#define VAR_NOVELL "novell"
#define VAR_NTPDATE "ntpDate"
#define VAR_PCNFSD "pcnfsd"
#define VAR_PKG_TMPDIR "PKG_TMPDIR"
@ -365,11 +364,6 @@ extern int configSaverTimeout(dialogMenuItem *self);
extern int configNTP(dialogMenuItem *self);
extern int configXFree86(dialogMenuItem *self);
extern int configRoutedFlags(dialogMenuItem *self);
extern int configGated(dialogMenuItem *self);
extern int configSamba(dialogMenuItem *self);
extern int configPCNFSD(dialogMenuItem *self);
extern int configNFSServer(dialogMenuItem *self);
extern int configNovell(dialogMenuItem *self);
/* crc.c */
extern int crc(int, unsigned long *, unsigned long *);
@ -476,6 +470,11 @@ extern int installFilesystems(dialogMenuItem *self);
extern int installVarDefaults(dialogMenuItem *self);
extern Boolean copySelf(void);
/* installFinal.c */
extern int configGated(dialogMenuItem *self);
extern int configSamba(dialogMenuItem *self);
extern int configPCNFSD(dialogMenuItem *self);
extern int configNFSServer(dialogMenuItem *self);
/* label.c */
extern int diskLabelEditor(dialogMenuItem *self);

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: config.c,v 1.38 1996/06/25 04:28:20 jkh Exp $
* $Id: config.c,v 1.39 1996/06/29 02:22:39 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -578,22 +578,6 @@ configGated(dialogMenuItem *self)
return ret;
}
/* Load novell client/server package */
int
configNovell(dialogMenuItem *self)
{
int ret = DITEM_SUCCESS;
if (variable_get(VAR_NOVELL))
variable_unset(VAR_NOVELL);
else {
ret = package_add("commerce/netcon/bsd60");
if (DITEM_STATUS(ret) == DITEM_SUCCESS)
variable_set2(VAR_NOVELL, "YES");
}
return ret;
}
/* Load pcnfsd package */
int
configPCNFSD(dialogMenuItem *self)

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.73 1996/06/27 07:03:44 jkh Exp $
* $Id: menus.c,v 1.74 1996/06/29 02:22:44 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -1037,8 +1037,6 @@ aspects of your system's network configuration.",
dmenuVarCheck, dmenuToggleVariable, NULL, "gateway=YES" },
{ "Gated", "This machine wants to run gated instead of routed",
dmenuVarCheck, configGated, NULL, "gated" },
{ "Novell", "Install the Novell client/server demo package",
dmenuVarCheck, configNovell, NULL, "novell" },
{ "Ntpdate", "Select a clock-syncronization server",
dmenuVarCheck, dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']', (int)"ntpdate" },
{ "Routed", "Set flags for routed (default: -q)",

View file

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
* $Id: sysinstall.h,v 1.64 1996/06/17 21:48:33 jkh Exp $
* $Id: sysinstall.h,v 1.42.2.58 1996/06/17 21:57:54 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -117,7 +117,6 @@
#define VAR_NFS_SECURE "nfsSecure"
#define VAR_NFS_SERVER "nfs_server"
#define VAR_NO_CONFIRM "noConfirm"
#define VAR_NOVELL "novell"
#define VAR_NTPDATE "ntpDate"
#define VAR_PCNFSD "pcnfsd"
#define VAR_PKG_TMPDIR "PKG_TMPDIR"
@ -365,11 +364,6 @@ extern int configSaverTimeout(dialogMenuItem *self);
extern int configNTP(dialogMenuItem *self);
extern int configXFree86(dialogMenuItem *self);
extern int configRoutedFlags(dialogMenuItem *self);
extern int configGated(dialogMenuItem *self);
extern int configSamba(dialogMenuItem *self);
extern int configPCNFSD(dialogMenuItem *self);
extern int configNFSServer(dialogMenuItem *self);
extern int configNovell(dialogMenuItem *self);
/* crc.c */
extern int crc(int, unsigned long *, unsigned long *);
@ -476,6 +470,11 @@ extern int installFilesystems(dialogMenuItem *self);
extern int installVarDefaults(dialogMenuItem *self);
extern Boolean copySelf(void);
/* installFinal.c */
extern int configGated(dialogMenuItem *self);
extern int configSamba(dialogMenuItem *self);
extern int configPCNFSD(dialogMenuItem *self);
extern int configNFSServer(dialogMenuItem *self);
/* label.c */
extern int diskLabelEditor(dialogMenuItem *self);

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: config.c,v 1.38 1996/06/25 04:28:20 jkh Exp $
* $Id: config.c,v 1.39 1996/06/29 02:22:39 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -578,22 +578,6 @@ configGated(dialogMenuItem *self)
return ret;
}
/* Load novell client/server package */
int
configNovell(dialogMenuItem *self)
{
int ret = DITEM_SUCCESS;
if (variable_get(VAR_NOVELL))
variable_unset(VAR_NOVELL);
else {
ret = package_add("commerce/netcon/bsd60");
if (DITEM_STATUS(ret) == DITEM_SUCCESS)
variable_set2(VAR_NOVELL, "YES");
}
return ret;
}
/* Load pcnfsd package */
int
configPCNFSD(dialogMenuItem *self)

View file

@ -24,7 +24,7 @@
(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_COMPAT1X | DIST_COMPAT20 | DIST_COMPAT21)
(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT | DIST_COMPAT1X | DIST_COMPAT20)
#define _DIST_XDEV \
(DIST_XF86_BIN | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS)

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.73 1996/06/27 07:03:44 jkh Exp $
* $Id: menus.c,v 1.74 1996/06/29 02:22:44 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -1037,8 +1037,6 @@ aspects of your system's network configuration.",
dmenuVarCheck, dmenuToggleVariable, NULL, "gateway=YES" },
{ "Gated", "This machine wants to run gated instead of routed",
dmenuVarCheck, configGated, NULL, "gated" },
{ "Novell", "Install the Novell client/server demo package",
dmenuVarCheck, configNovell, NULL, "novell" },
{ "Ntpdate", "Select a clock-syncronization server",
dmenuVarCheck, dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']', (int)"ntpdate" },
{ "Routed", "Set flags for routed (default: -q)",

View file

@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated to essentially a complete rewrite.
*
* $Id: sysinstall.h,v 1.64 1996/06/17 21:48:33 jkh Exp $
* $Id: sysinstall.h,v 1.42.2.58 1996/06/17 21:57:54 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -117,7 +117,6 @@
#define VAR_NFS_SECURE "nfsSecure"
#define VAR_NFS_SERVER "nfs_server"
#define VAR_NO_CONFIRM "noConfirm"
#define VAR_NOVELL "novell"
#define VAR_NTPDATE "ntpDate"
#define VAR_PCNFSD "pcnfsd"
#define VAR_PKG_TMPDIR "PKG_TMPDIR"
@ -365,11 +364,6 @@ extern int configSaverTimeout(dialogMenuItem *self);
extern int configNTP(dialogMenuItem *self);
extern int configXFree86(dialogMenuItem *self);
extern int configRoutedFlags(dialogMenuItem *self);
extern int configGated(dialogMenuItem *self);
extern int configSamba(dialogMenuItem *self);
extern int configPCNFSD(dialogMenuItem *self);
extern int configNFSServer(dialogMenuItem *self);
extern int configNovell(dialogMenuItem *self);
/* crc.c */
extern int crc(int, unsigned long *, unsigned long *);
@ -476,6 +470,11 @@ extern int installFilesystems(dialogMenuItem *self);
extern int installVarDefaults(dialogMenuItem *self);
extern Boolean copySelf(void);
/* installFinal.c */
extern int configGated(dialogMenuItem *self);
extern int configSamba(dialogMenuItem *self);
extern int configPCNFSD(dialogMenuItem *self);
extern int configNFSServer(dialogMenuItem *self);
/* label.c */
extern int diskLabelEditor(dialogMenuItem *self);