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

various bits of overdue cleanup.

Browse Source
This commit is contained in:
Jordan K. Hubbard 1998-09-30 11:49:37 +00:00
parent 35e9eb2f68
commit 9bb1c20147
9 changed files with 21 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
release/sysinstall/config.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: config.c,v 1.110 1998/03/24 09:51:54 jkh Exp $
* $Id: config.c,v 1.111 1998/09/23 12:13:47 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -721,28 +721,6 @@ configPackages(dialogMenuItem *self)
return DITEM_SUCCESS | DITEM_RESTORE;
}
#ifdef NETCON_EXTENTIONS
/* Load novell client/server package */
int
configNovell(dialogMenuItem *self)
{
int ret = DITEM_SUCCESS;
if (!RunningAsInit) {
msgConfirm("This package can only be installed in multi-user mode.");
return ret;
}
if (variable_get(VAR_NOVELL))
variable_unset(VAR_NOVELL);
else {
ret = package_add(PACKAGE_NETCON);
if (DITEM_STATUS(ret) == DITEM_SUCCESS)
variable_set2(VAR_NOVELL, "YES");
}
return ret | DITEM_RESTORE;
}
#endif
/* Load pcnfsd package */
int
configPCNFSD(dialogMenuItem *self)

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.168 1998/07/21 06:44:40 jkh Exp $
* $Id: menus.c,v 1.169 1998/09/09 05:09:55 danny Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -1207,10 +1207,6 @@ DMenu MenuNetworking = {
dmenuVarCheck, dmenuToggleVariable, NULL, "tcp_extensions=YES" },
{ "Gateway", "This machine will route packets between interfaces",
dmenuVarCheck, dmenuToggleVariable, NULL, "gateway_enable=YES" },
#ifdef NETCON_EXTENTIONS
{ "Netcon", "Install the Novell client/server demo package",
dmenuVarCheck, configNovell, NULL, "novell" },
#endif
{ "Ntpdate", "Select a clock-synchronization server",
dmenuVarCheck, dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']', (int)"ntpdate_enable=YES" },
{ "router", "Select routing daemon (default: routed)",

14
release/sysinstall/sysinstall.h
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.146 1998/05/24 20:01:33 jkh Exp $
* $Id: sysinstall.h,v 1.147 1998/07/18 09:42:01 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -55,11 +55,10 @@
/*** Defines ***/
/* Different packages we depend on - update this when package version change! */
#define PACKAGE_GATED "gated-3.5.8"
#define PACKAGE_NETCON "commerce/netcon/bsd61"
#define PACKAGE_PCNFSD "pcnfsd-93.02.16"
#define PACKAGE_LYNX "lynx-2.7.2"
/* Different packages we depend on - update symlinks when versions change! */
#define PACKAGE_GATED "gated"
#define PACKAGE_PCNFSD "pcnfsd"
#define PACKAGE_LYNX "lynx"
/* device limits */
#define DEV_NAME_MAX 64 /* The maximum length of a device name */
@ -440,9 +439,6 @@ extern int configRouter(dialogMenuItem *self);
extern int configPCNFSD(dialogMenuItem *self);
extern int configNFSServer(dialogMenuItem *self);
extern int configWriteRC_conf(dialogMenuItem *self);
#ifdef NETCON_EXTENTIONS
extern int configNovell(dialogMenuItem *self);
#endif
/* crc.c */
extern int crc(int, unsigned long *, unsigned long *);

24
usr.sbin/sade/config.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: config.c,v 1.110 1998/03/24 09:51:54 jkh Exp $
* $Id: config.c,v 1.111 1998/09/23 12:13:47 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -721,28 +721,6 @@ configPackages(dialogMenuItem *self)
return DITEM_SUCCESS | DITEM_RESTORE;
}
#ifdef NETCON_EXTENTIONS
/* Load novell client/server package */
int
configNovell(dialogMenuItem *self)
{
int ret = DITEM_SUCCESS;
if (!RunningAsInit) {
msgConfirm("This package can only be installed in multi-user mode.");
return ret;
}
if (variable_get(VAR_NOVELL))
variable_unset(VAR_NOVELL);
else {
ret = package_add(PACKAGE_NETCON);
if (DITEM_STATUS(ret) == DITEM_SUCCESS)
variable_set2(VAR_NOVELL, "YES");
}
return ret | DITEM_RESTORE;
}
#endif
/* Load pcnfsd package */
int
configPCNFSD(dialogMenuItem *self)

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.168 1998/07/21 06:44:40 jkh Exp $
* $Id: menus.c,v 1.169 1998/09/09 05:09:55 danny Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -1207,10 +1207,6 @@ DMenu MenuNetworking = {
dmenuVarCheck, dmenuToggleVariable, NULL, "tcp_extensions=YES" },
{ "Gateway", "This machine will route packets between interfaces",
dmenuVarCheck, dmenuToggleVariable, NULL, "gateway_enable=YES" },
#ifdef NETCON_EXTENTIONS
{ "Netcon", "Install the Novell client/server demo package",
dmenuVarCheck, configNovell, NULL, "novell" },
#endif
{ "Ntpdate", "Select a clock-synchronization server",
dmenuVarCheck, dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']', (int)"ntpdate_enable=YES" },
{ "router", "Select routing daemon (default: routed)",

14
usr.sbin/sade/sade.h
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.146 1998/05/24 20:01:33 jkh Exp $
* $Id: sysinstall.h,v 1.147 1998/07/18 09:42:01 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -55,11 +55,10 @@
/*** Defines ***/
/* Different packages we depend on - update this when package version change! */
#define PACKAGE_GATED "gated-3.5.8"
#define PACKAGE_NETCON "commerce/netcon/bsd61"
#define PACKAGE_PCNFSD "pcnfsd-93.02.16"
#define PACKAGE_LYNX "lynx-2.7.2"
/* Different packages we depend on - update symlinks when versions change! */
#define PACKAGE_GATED "gated"
#define PACKAGE_PCNFSD "pcnfsd"
#define PACKAGE_LYNX "lynx"
/* device limits */
#define DEV_NAME_MAX 64 /* The maximum length of a device name */
@ -440,9 +439,6 @@ extern int configRouter(dialogMenuItem *self);
extern int configPCNFSD(dialogMenuItem *self);
extern int configNFSServer(dialogMenuItem *self);
extern int configWriteRC_conf(dialogMenuItem *self);
#ifdef NETCON_EXTENTIONS
extern int configNovell(dialogMenuItem *self);
#endif
/* crc.c */
extern int crc(int, unsigned long *, unsigned long *);

24
usr.sbin/sysinstall/config.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: config.c,v 1.110 1998/03/24 09:51:54 jkh Exp $
* $Id: config.c,v 1.111 1998/09/23 12:13:47 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -721,28 +721,6 @@ configPackages(dialogMenuItem *self)
return DITEM_SUCCESS | DITEM_RESTORE;
}
#ifdef NETCON_EXTENTIONS
/* Load novell client/server package */
int
configNovell(dialogMenuItem *self)
{
int ret = DITEM_SUCCESS;
if (!RunningAsInit) {
msgConfirm("This package can only be installed in multi-user mode.");
return ret;
}
if (variable_get(VAR_NOVELL))
variable_unset(VAR_NOVELL);
else {
ret = package_add(PACKAGE_NETCON);
if (DITEM_STATUS(ret) == DITEM_SUCCESS)
variable_set2(VAR_NOVELL, "YES");
}
return ret | DITEM_RESTORE;
}
#endif
/* Load pcnfsd package */
int
configPCNFSD(dialogMenuItem *self)

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.168 1998/07/21 06:44:40 jkh Exp $
* $Id: menus.c,v 1.169 1998/09/09 05:09:55 danny Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -1207,10 +1207,6 @@ DMenu MenuNetworking = {
dmenuVarCheck, dmenuToggleVariable, NULL, "tcp_extensions=YES" },
{ "Gateway", "This machine will route packets between interfaces",
dmenuVarCheck, dmenuToggleVariable, NULL, "gateway_enable=YES" },
#ifdef NETCON_EXTENTIONS
{ "Netcon", "Install the Novell client/server demo package",
dmenuVarCheck, configNovell, NULL, "novell" },
#endif
{ "Ntpdate", "Select a clock-synchronization server",
dmenuVarCheck, dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']', (int)"ntpdate_enable=YES" },
{ "router", "Select routing daemon (default: routed)",

14
usr.sbin/sysinstall/sysinstall.h
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.146 1998/05/24 20:01:33 jkh Exp $
* $Id: sysinstall.h,v 1.147 1998/07/18 09:42:01 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -55,11 +55,10 @@
/*** Defines ***/
/* Different packages we depend on - update this when package version change! */
#define PACKAGE_GATED "gated-3.5.8"
#define PACKAGE_NETCON "commerce/netcon/bsd61"
#define PACKAGE_PCNFSD "pcnfsd-93.02.16"
#define PACKAGE_LYNX "lynx-2.7.2"
/* Different packages we depend on - update symlinks when versions change! */
#define PACKAGE_GATED "gated"
#define PACKAGE_PCNFSD "pcnfsd"
#define PACKAGE_LYNX "lynx"
/* device limits */
#define DEV_NAME_MAX 64 /* The maximum length of a device name */
@ -440,9 +439,6 @@ extern int configRouter(dialogMenuItem *self);
extern int configPCNFSD(dialogMenuItem *self);
extern int configNFSServer(dialogMenuItem *self);
extern int configWriteRC_conf(dialogMenuItem *self);
#ifdef NETCON_EXTENTIONS
extern int configNovell(dialogMenuItem *self);
#endif
/* crc.c */
extern int crc(int, unsigned long *, unsigned long *);