From 5513142d9c4c1d8e0378c5e7b2936fa5486a87db Mon Sep 17 00:00:00 2001
From: jkh <jkh@FreeBSD.org>
Date: Thu, 4 Jul 1996 23:12:05 +0000
Subject: [PATCH] Fix some minor reported bogons from the BETA

---
 release/sysinstall/config.c         | 17 ++++++-----
 release/sysinstall/help/install.hlp |  8 ++---
 release/sysinstall/install.c        |  4 +--
 release/sysinstall/menus.c          | 46 ++++++++++++++---------------
 release/sysinstall/sysinstall.h     |  4 +--
 usr.sbin/sade/config.c              | 17 ++++++-----
 usr.sbin/sade/install.c             |  4 +--
 usr.sbin/sade/menus.c               | 46 ++++++++++++++---------------
 usr.sbin/sade/sade.h                |  4 +--
 usr.sbin/sysinstall/config.c        | 17 ++++++-----
 usr.sbin/sysinstall/install.c       |  4 +--
 usr.sbin/sysinstall/menus.c         | 46 ++++++++++++++---------------
 usr.sbin/sysinstall/sysinstall.h    |  4 +--
 13 files changed, 115 insertions(+), 106 deletions(-)

diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c
index 823857adb7ce..cba95141c854 100644
--- a/release/sysinstall/config.c
+++ b/release/sysinstall/config.c
@@ -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.41 1996/06/29 03:43:17 jkh Exp $
+ * $Id: config.c,v 1.42 1996/07/02 09:12:34 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -339,13 +339,16 @@ configSaverTimeout(dialogMenuItem *self)
 int
 configNTP(dialogMenuItem *self)
 {
-    if (variable_get(VAR_NTPDATE)) {
-	variable_unset(VAR_NTPDATE);
-	return DITEM_SUCCESS | DITEM_REDRAW;
+    int status;
+
+    status = variable_get_value(VAR_NTPDATE, "Enter the name of an NTP server") ? DITEM_SUCCESS : DITEM_FAILURE;
+    if (status == DITEM_SUCCESS) {
+	static char tmp[255];
+
+	snprintf(tmp, 255, "%s=%s", VAR_NTPDATE, variable_get(VAR_NTPDATE));
+	self->aux = (int)tmp;
     }
-    else
-	return variable_get_value(VAR_NTPDATE, "Enter the name of an NTP server")
-	    ? DITEM_SUCCESS : DITEM_FAILURE;
+    return status;
 }
 
 int
diff --git a/release/sysinstall/help/install.hlp b/release/sysinstall/help/install.hlp
index 6e145c9542fd..044acc495cd1 100644
--- a/release/sysinstall/help/install.hlp
+++ b/release/sysinstall/help/install.hlp
@@ -114,8 +114,7 @@ CDROM distributions may work as well, though we cannot say for certain
 as we have no hand or say in how they're created).  You can either
 boot into the CD installation directly from DOS using Walnut Creek's
 supplied ``install.bat'' batch file or you can make a boot floppy with
-the ``makeflp.bat'' command [NOTE: If you're using an IDE CDROM, use
-the inst_ide.bat or atapiflp.bat batch files instead].
+the ``makeflp.bat'' command.
 
 For the easiest interface of all (from DOS), type "view".  This will
 bring up a DOS menu utility that leads you through all the available
@@ -128,8 +127,9 @@ your hardware and operating system environment.
 
 Once you've booted from DOS or floppy, you should then be able to
 select CDROM as the media type in the Media menu and load the entire
-distribution from CDROM.  No other types of installation media should
-be required.
+distribution from CDROM (note: If you have only one CDROM drive, and
+the appropriate FreeBSD CDROM is detected in it, it will be selected
+automatically as your media).
 
 After your system is fully installed and you have rebooted from the
 hard disk, you can mount the cdrom at any time by typing: ``mount /cdrom''
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c
index 2a91fbac66b3..3031e3f8d35c 100644
--- a/release/sysinstall/install.c
+++ b/release/sysinstall/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: install.c,v 1.105 1996/07/02 01:03:42 jkh Exp $
+ * $Id: install.c,v 1.106 1996/07/02 10:57:52 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -250,7 +250,7 @@ installFixitFloppy(dialogMenuItem *self)
     /* Link the spwd.db file */
     if (DITEM_STATUS(Mkdir("/etc", NULL)) != DITEM_SUCCESS)
 	msgConfirm("Unable to create an /etc directory!  Things are weird on this floppy..");
-    else if (symlink("/mnt2/etc/spwd.db", "/etc/spwd.db") == -1)
+    else if (symlink("/mnt2/etc/spwd.db", "/etc/spwd.db") == -1 && errno != EEXIST)
 	msgConfirm("Couldn't symlink the /etc/spwd.db file!  I'm not sure I like this..");
     if (!file_readable(TERMCAP_FILE))
 	create_termcap();
diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c
index b8036b446062..73026e28ad06 100644
--- a/release/sysinstall/menus.c
+++ b/release/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.77 1996/07/02 01:03:47 jkh Exp $
+ * $Id: menus.c,v 1.78 1996/07/02 10:57:54 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -1039,10 +1039,10 @@ 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",
+  { "Netcon",		"Install the Novell client/server demo package",
     dmenuVarCheck, configNovell, NULL, "novell" },
   { "Ntpdate",		"Select a clock-syncronization server",
-    dmenuVarCheck, dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']', (int)"ntpdate" },
+    dmenuVarCheck, dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']', (int)VAR_NTPDATE },
   { "Routed",		"Set flags for routed (default: -q)",
     dmenuVarCheck, configRoutedFlags, NULL, "routed" },
   { "Rwhod",		"This machine wants to run the rwho daemon",
@@ -1069,45 +1069,45 @@ close to you to have your system time syncronized accordingly.",
     "These are the primary open-access NTP servers",
     NULL,
 { { "Other",			"Select a site not on this list",
-    NULL, configNTP },
+    dmenuVarCheck, configNTP, NULL, NULL },
   { "Australia",		"ntp.syd.dms.csiro.au (HP 5061 Cesium Beam)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=ntp.syd.dms.csiro.au" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ntp.syd.dms.csiro.au" },
   { "Canada",			"tick.usask.ca (GOES clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=tick.usask.ca" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=tick.usask.ca" },
   { "France",			"canon.inria.fr (TDF clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=canon.inria.fr" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=canon.inria.fr" },
   { "Germany",			"ntps1-{0,1,2}.uni-erlangen.de (GPS)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=ntps1-0.uni-erlangen.de" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ntps1-0.uni-erlangen.de" },
   { "Germany #2",		"ntps1-0.cs.tu-berlin.de (GPS)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=ntps1-0.cs.tu-berlin.de" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ntps1-0.cs.tu-berlin.de" },
   { "Japan",			"clock.nc.fukuoka-u.ac.jp (GPS clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=clock.nc.fukuoka-u.ac.jp" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=clock.nc.fukuoka-u.ac.jp" },
   { "Japan #2",			"clock.tl.fukuoka-u.ac.jp (GPS clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=clock.tl.fukuoka-u.ac.jp" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=clock.tl.fukuoka-u.ac.jp" },
   { "Netherlands",		"ntp0.nl.net (GPS clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=ntp0.nl.net" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ntp0.nl.net" },
   { "Norway",			"timer.unik.no (NTP clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=timer.unik.no" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=timer.unik.no" },
   { "Sweden",			"Time1.Stupi.SE (Cesium/GPS)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=Time1.Stupi.SE" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=Time1.Stupi.SE" },
   { "Switzerland",		"swisstime.ethz.ch (DCF77 clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=swisstime.ethz.ch" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=swisstime.ethz.ch" },
   { "U.S. East Coast",		"bitsy.mit.edu (WWV clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=bitsy.mit.edu" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=bitsy.mit.edu" },
   { "U.S. East Coast #2",	"otc1.psu.edu (WWV clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=otc1.psu.edu" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=otc1.psu.edu" },
   { "U.S. West Coast",		"apple.com (WWV clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=apple.com" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=apple.com" },
   { "U.S. West Coast #2",	"clepsydra.dec.com (GOES clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=clepsydra.dec.com" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=clepsydra.dec.com" },
   { "U.S. West Coast #3",	"clock.llnl.gov (WWVB clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=clock.llnl.gov" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=clock.llnl.gov" },
   { "U.S. Midwest",		"ncar.ucar.edu (WWVB clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=ncar.ucar.edu" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ncar.ucar.edu" },
   { "U.S. Pacific",		"chantry.hawaii.net (WWV/H clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=chantry.hawaii.net" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=chantry.hawaii.net" },
   { "U.S. Southwest",		"shorty.chpc.utexas.edu (WWV clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=shorty.chpc.utexas.edu" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=shorty.chpc.utexas.edu" },
   { NULL } },
 };
 
diff --git a/release/sysinstall/sysinstall.h b/release/sysinstall/sysinstall.h
index 130f808b9e44..d4d7f809ff12 100644
--- a/release/sysinstall/sysinstall.h
+++ b/release/sysinstall/sysinstall.h
@@ -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.68 1996/07/02 01:03:51 jkh Exp $
+ * $Id: sysinstall.h,v 1.69 1996/07/02 10:57:56 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -116,7 +116,7 @@
 #define VAR_NFS_SERVER			"nfs_server"
 #define VAR_NO_CONFIRM			"noConfirm"
 #define VAR_NOVELL			"novell"
-#define VAR_NTPDATE			"ntpDate"
+#define VAR_NTPDATE			"ntpdate"
 #define VAR_PCNFSD			"pcnfsd"
 #define VAR_PKG_TMPDIR			"PKG_TMPDIR"
 #define VAR_PORTS_PATH			"ports"
diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c
index 823857adb7ce..cba95141c854 100644
--- a/usr.sbin/sade/config.c
+++ b/usr.sbin/sade/config.c
@@ -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.41 1996/06/29 03:43:17 jkh Exp $
+ * $Id: config.c,v 1.42 1996/07/02 09:12:34 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -339,13 +339,16 @@ configSaverTimeout(dialogMenuItem *self)
 int
 configNTP(dialogMenuItem *self)
 {
-    if (variable_get(VAR_NTPDATE)) {
-	variable_unset(VAR_NTPDATE);
-	return DITEM_SUCCESS | DITEM_REDRAW;
+    int status;
+
+    status = variable_get_value(VAR_NTPDATE, "Enter the name of an NTP server") ? DITEM_SUCCESS : DITEM_FAILURE;
+    if (status == DITEM_SUCCESS) {
+	static char tmp[255];
+
+	snprintf(tmp, 255, "%s=%s", VAR_NTPDATE, variable_get(VAR_NTPDATE));
+	self->aux = (int)tmp;
     }
-    else
-	return variable_get_value(VAR_NTPDATE, "Enter the name of an NTP server")
-	    ? DITEM_SUCCESS : DITEM_FAILURE;
+    return status;
 }
 
 int
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 2a91fbac66b3..3031e3f8d35c 100644
--- a/usr.sbin/sade/install.c
+++ b/usr.sbin/sade/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: install.c,v 1.105 1996/07/02 01:03:42 jkh Exp $
+ * $Id: install.c,v 1.106 1996/07/02 10:57:52 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -250,7 +250,7 @@ installFixitFloppy(dialogMenuItem *self)
     /* Link the spwd.db file */
     if (DITEM_STATUS(Mkdir("/etc", NULL)) != DITEM_SUCCESS)
 	msgConfirm("Unable to create an /etc directory!  Things are weird on this floppy..");
-    else if (symlink("/mnt2/etc/spwd.db", "/etc/spwd.db") == -1)
+    else if (symlink("/mnt2/etc/spwd.db", "/etc/spwd.db") == -1 && errno != EEXIST)
 	msgConfirm("Couldn't symlink the /etc/spwd.db file!  I'm not sure I like this..");
     if (!file_readable(TERMCAP_FILE))
 	create_termcap();
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index b8036b446062..73026e28ad06 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.77 1996/07/02 01:03:47 jkh Exp $
+ * $Id: menus.c,v 1.78 1996/07/02 10:57:54 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -1039,10 +1039,10 @@ 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",
+  { "Netcon",		"Install the Novell client/server demo package",
     dmenuVarCheck, configNovell, NULL, "novell" },
   { "Ntpdate",		"Select a clock-syncronization server",
-    dmenuVarCheck, dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']', (int)"ntpdate" },
+    dmenuVarCheck, dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']', (int)VAR_NTPDATE },
   { "Routed",		"Set flags for routed (default: -q)",
     dmenuVarCheck, configRoutedFlags, NULL, "routed" },
   { "Rwhod",		"This machine wants to run the rwho daemon",
@@ -1069,45 +1069,45 @@ close to you to have your system time syncronized accordingly.",
     "These are the primary open-access NTP servers",
     NULL,
 { { "Other",			"Select a site not on this list",
-    NULL, configNTP },
+    dmenuVarCheck, configNTP, NULL, NULL },
   { "Australia",		"ntp.syd.dms.csiro.au (HP 5061 Cesium Beam)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=ntp.syd.dms.csiro.au" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ntp.syd.dms.csiro.au" },
   { "Canada",			"tick.usask.ca (GOES clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=tick.usask.ca" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=tick.usask.ca" },
   { "France",			"canon.inria.fr (TDF clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=canon.inria.fr" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=canon.inria.fr" },
   { "Germany",			"ntps1-{0,1,2}.uni-erlangen.de (GPS)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=ntps1-0.uni-erlangen.de" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ntps1-0.uni-erlangen.de" },
   { "Germany #2",		"ntps1-0.cs.tu-berlin.de (GPS)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=ntps1-0.cs.tu-berlin.de" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ntps1-0.cs.tu-berlin.de" },
   { "Japan",			"clock.nc.fukuoka-u.ac.jp (GPS clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=clock.nc.fukuoka-u.ac.jp" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=clock.nc.fukuoka-u.ac.jp" },
   { "Japan #2",			"clock.tl.fukuoka-u.ac.jp (GPS clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=clock.tl.fukuoka-u.ac.jp" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=clock.tl.fukuoka-u.ac.jp" },
   { "Netherlands",		"ntp0.nl.net (GPS clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=ntp0.nl.net" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ntp0.nl.net" },
   { "Norway",			"timer.unik.no (NTP clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=timer.unik.no" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=timer.unik.no" },
   { "Sweden",			"Time1.Stupi.SE (Cesium/GPS)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=Time1.Stupi.SE" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=Time1.Stupi.SE" },
   { "Switzerland",		"swisstime.ethz.ch (DCF77 clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=swisstime.ethz.ch" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=swisstime.ethz.ch" },
   { "U.S. East Coast",		"bitsy.mit.edu (WWV clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=bitsy.mit.edu" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=bitsy.mit.edu" },
   { "U.S. East Coast #2",	"otc1.psu.edu (WWV clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=otc1.psu.edu" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=otc1.psu.edu" },
   { "U.S. West Coast",		"apple.com (WWV clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=apple.com" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=apple.com" },
   { "U.S. West Coast #2",	"clepsydra.dec.com (GOES clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=clepsydra.dec.com" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=clepsydra.dec.com" },
   { "U.S. West Coast #3",	"clock.llnl.gov (WWVB clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=clock.llnl.gov" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=clock.llnl.gov" },
   { "U.S. Midwest",		"ncar.ucar.edu (WWVB clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=ncar.ucar.edu" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ncar.ucar.edu" },
   { "U.S. Pacific",		"chantry.hawaii.net (WWV/H clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=chantry.hawaii.net" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=chantry.hawaii.net" },
   { "U.S. Southwest",		"shorty.chpc.utexas.edu (WWV clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=shorty.chpc.utexas.edu" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=shorty.chpc.utexas.edu" },
   { NULL } },
 };
 
diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h
index 130f808b9e44..d4d7f809ff12 100644
--- a/usr.sbin/sade/sade.h
+++ b/usr.sbin/sade/sade.h
@@ -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.68 1996/07/02 01:03:51 jkh Exp $
+ * $Id: sysinstall.h,v 1.69 1996/07/02 10:57:56 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -116,7 +116,7 @@
 #define VAR_NFS_SERVER			"nfs_server"
 #define VAR_NO_CONFIRM			"noConfirm"
 #define VAR_NOVELL			"novell"
-#define VAR_NTPDATE			"ntpDate"
+#define VAR_NTPDATE			"ntpdate"
 #define VAR_PCNFSD			"pcnfsd"
 #define VAR_PKG_TMPDIR			"PKG_TMPDIR"
 #define VAR_PORTS_PATH			"ports"
diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c
index 823857adb7ce..cba95141c854 100644
--- a/usr.sbin/sysinstall/config.c
+++ b/usr.sbin/sysinstall/config.c
@@ -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.41 1996/06/29 03:43:17 jkh Exp $
+ * $Id: config.c,v 1.42 1996/07/02 09:12:34 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -339,13 +339,16 @@ configSaverTimeout(dialogMenuItem *self)
 int
 configNTP(dialogMenuItem *self)
 {
-    if (variable_get(VAR_NTPDATE)) {
-	variable_unset(VAR_NTPDATE);
-	return DITEM_SUCCESS | DITEM_REDRAW;
+    int status;
+
+    status = variable_get_value(VAR_NTPDATE, "Enter the name of an NTP server") ? DITEM_SUCCESS : DITEM_FAILURE;
+    if (status == DITEM_SUCCESS) {
+	static char tmp[255];
+
+	snprintf(tmp, 255, "%s=%s", VAR_NTPDATE, variable_get(VAR_NTPDATE));
+	self->aux = (int)tmp;
     }
-    else
-	return variable_get_value(VAR_NTPDATE, "Enter the name of an NTP server")
-	    ? DITEM_SUCCESS : DITEM_FAILURE;
+    return status;
 }
 
 int
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 2a91fbac66b3..3031e3f8d35c 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/install.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: install.c,v 1.105 1996/07/02 01:03:42 jkh Exp $
+ * $Id: install.c,v 1.106 1996/07/02 10:57:52 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -250,7 +250,7 @@ installFixitFloppy(dialogMenuItem *self)
     /* Link the spwd.db file */
     if (DITEM_STATUS(Mkdir("/etc", NULL)) != DITEM_SUCCESS)
 	msgConfirm("Unable to create an /etc directory!  Things are weird on this floppy..");
-    else if (symlink("/mnt2/etc/spwd.db", "/etc/spwd.db") == -1)
+    else if (symlink("/mnt2/etc/spwd.db", "/etc/spwd.db") == -1 && errno != EEXIST)
 	msgConfirm("Couldn't symlink the /etc/spwd.db file!  I'm not sure I like this..");
     if (!file_readable(TERMCAP_FILE))
 	create_termcap();
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index b8036b446062..73026e28ad06 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.77 1996/07/02 01:03:47 jkh Exp $
+ * $Id: menus.c,v 1.78 1996/07/02 10:57:54 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -1039,10 +1039,10 @@ 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",
+  { "Netcon",		"Install the Novell client/server demo package",
     dmenuVarCheck, configNovell, NULL, "novell" },
   { "Ntpdate",		"Select a clock-syncronization server",
-    dmenuVarCheck, dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']', (int)"ntpdate" },
+    dmenuVarCheck, dmenuSubmenu, NULL, &MenuNTP, '[', 'X', ']', (int)VAR_NTPDATE },
   { "Routed",		"Set flags for routed (default: -q)",
     dmenuVarCheck, configRoutedFlags, NULL, "routed" },
   { "Rwhod",		"This machine wants to run the rwho daemon",
@@ -1069,45 +1069,45 @@ close to you to have your system time syncronized accordingly.",
     "These are the primary open-access NTP servers",
     NULL,
 { { "Other",			"Select a site not on this list",
-    NULL, configNTP },
+    dmenuVarCheck, configNTP, NULL, NULL },
   { "Australia",		"ntp.syd.dms.csiro.au (HP 5061 Cesium Beam)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=ntp.syd.dms.csiro.au" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ntp.syd.dms.csiro.au" },
   { "Canada",			"tick.usask.ca (GOES clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=tick.usask.ca" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=tick.usask.ca" },
   { "France",			"canon.inria.fr (TDF clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=canon.inria.fr" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=canon.inria.fr" },
   { "Germany",			"ntps1-{0,1,2}.uni-erlangen.de (GPS)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=ntps1-0.uni-erlangen.de" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ntps1-0.uni-erlangen.de" },
   { "Germany #2",		"ntps1-0.cs.tu-berlin.de (GPS)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=ntps1-0.cs.tu-berlin.de" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ntps1-0.cs.tu-berlin.de" },
   { "Japan",			"clock.nc.fukuoka-u.ac.jp (GPS clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=clock.nc.fukuoka-u.ac.jp" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=clock.nc.fukuoka-u.ac.jp" },
   { "Japan #2",			"clock.tl.fukuoka-u.ac.jp (GPS clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=clock.tl.fukuoka-u.ac.jp" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=clock.tl.fukuoka-u.ac.jp" },
   { "Netherlands",		"ntp0.nl.net (GPS clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=ntp0.nl.net" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ntp0.nl.net" },
   { "Norway",			"timer.unik.no (NTP clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=timer.unik.no" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=timer.unik.no" },
   { "Sweden",			"Time1.Stupi.SE (Cesium/GPS)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=Time1.Stupi.SE" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=Time1.Stupi.SE" },
   { "Switzerland",		"swisstime.ethz.ch (DCF77 clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=swisstime.ethz.ch" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=swisstime.ethz.ch" },
   { "U.S. East Coast",		"bitsy.mit.edu (WWV clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=bitsy.mit.edu" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=bitsy.mit.edu" },
   { "U.S. East Coast #2",	"otc1.psu.edu (WWV clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=otc1.psu.edu" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=otc1.psu.edu" },
   { "U.S. West Coast",		"apple.com (WWV clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=apple.com" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=apple.com" },
   { "U.S. West Coast #2",	"clepsydra.dec.com (GOES clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=clepsydra.dec.com" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=clepsydra.dec.com" },
   { "U.S. West Coast #3",	"clock.llnl.gov (WWVB clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=clock.llnl.gov" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=clock.llnl.gov" },
   { "U.S. Midwest",		"ncar.ucar.edu (WWVB clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=ncar.ucar.edu" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=ncar.ucar.edu" },
   { "U.S. Pacific",		"chantry.hawaii.net (WWV/H clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=chantry.hawaii.net" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=chantry.hawaii.net" },
   { "U.S. Southwest",		"shorty.chpc.utexas.edu (WWV clock)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "ntpdate=shorty.chpc.utexas.edu" },
+    dmenuVarCheck, dmenuSetVariable, NULL, VAR_NTPDATE "=shorty.chpc.utexas.edu" },
   { NULL } },
 };
 
diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h
index 130f808b9e44..d4d7f809ff12 100644
--- a/usr.sbin/sysinstall/sysinstall.h
+++ b/usr.sbin/sysinstall/sysinstall.h
@@ -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.68 1996/07/02 01:03:51 jkh Exp $
+ * $Id: sysinstall.h,v 1.69 1996/07/02 10:57:56 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -116,7 +116,7 @@
 #define VAR_NFS_SERVER			"nfs_server"
 #define VAR_NO_CONFIRM			"noConfirm"
 #define VAR_NOVELL			"novell"
-#define VAR_NTPDATE			"ntpDate"
+#define VAR_NTPDATE			"ntpdate"
 #define VAR_PCNFSD			"pcnfsd"
 #define VAR_PKG_TMPDIR			"PKG_TMPDIR"
 #define VAR_PORTS_PATH			"ports"