Sync up to current state of development.

7 files changed, 26 insertions, 22 deletions

diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index c84e44c..76d53dc 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.178 1997/03/18 07:02:32 mpp Exp $
+ * $Id: install.c,v 1.134.2.40 1997/03/28 02:25:14 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -498,14 +498,15 @@ installNovice(dialogMenuItem *self)
 		   "may do so by typing: /stand/sysinstall.");
     }
     if (mediaDevice->type != DEVICE_TYPE_FTP && mediaDevice->type != DEVICE_TYPE_NFS) {
-	if (!msgYesNo("Would you like to configure any SLIP/PPP or network interface devices?")) {
+	if (!msgYesNo("Would you like to configure any Ethernet or SLIP/PPP network devices?")) {
 	    Device *tmp;
 
+	    dialog_clear_norefresh();
 	    tmp = tcpDeviceSelect();
+	    dialog_clear_norefresh();
 	    if (tmp && !msgYesNo("Would you like to bring the %s interface up right now?", tmp->name))
 		if (!tmp->init(tmp))
 		    msgConfirm("Initialization of %s device failed.", tmp->name);
-	    dialog_clear_norefresh();
 	}
     }
 
@@ -585,11 +586,13 @@ installNovice(dialogMenuItem *self)
 	configUsers(self);
 
     dialog_clear_norefresh();
-    if (!msgYesNo("Would you like to set the system manager's password now?\n\n"
-		  "This is the password you'll use to log in as \"root\".")) {
+    msgConfirm("Now you must set the system manager's password.\n"
+	       "This is the password you'll use to log in as \"root\".");
+    {
 	WINDOW *w = savescr();
 
-	systemExecute("passwd root");
+	if (!systemExecute("passwd root"))
+	    variable_set2("root_password", "YES");
 	restorescr(w);
     }
 
diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h
index 3f52dc4..bd7e775 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.121 1997/03/15 16:24:32 jkh Exp $
+ * $Id: sysinstall.h,v 1.122 1997/03/19 10:09:26 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -44,7 +44,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <dialog.h>
-#include <dialog.h>
 #include "ui_objects.h"
 #include "dir.h"
 #include "colors.h"
diff --git a/usr.sbin/sysinstall/anonFTP.c b/usr.sbin/sysinstall/anonFTP.c
index 9171232..45edf71 100644
--- a/usr.sbin/sysinstall/anonFTP.c
+++ b/usr.sbin/sysinstall/anonFTP.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: anonFTP.c,v 1.21 1997/02/07 04:25:16 jkh Exp $
+ * $Id: anonFTP.c,v 1.22 1997/03/09 22:25:38 jkh Exp $
  *
  * Copyright (c) 1995
  *	Coranth Gryphon.  All rights reserved.
@@ -168,7 +168,7 @@ createFtpUser(void)
 	return DITEM_SUCCESS; 	/* succeeds if already exists */
     }
     
-    sprintf(pwline, "%s::%s:%d::0:0:%s:%s:/bin/date\n", FTP_NAME, tconf.uid, gid, tconf.comment, tconf.homedir);
+    sprintf(pwline, "%s:*:%s:%d::0:0:%s:%s:/nonexistent\n", FTP_NAME, tconf.uid, gid, tconf.comment, tconf.homedir);
     
     fptr = fopen(_PATH_MASTERPASSWD,"a");
     if (! fptr) {
diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c
index 3e3f91a..ec6ac3a 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.103 1997/03/15 18:01:35 jkh Exp $
+ * $Id: dist.c,v 1.73.2.23 1997/03/25 02:45:37 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -390,7 +390,6 @@ distExtract(char *parent, Distribution *me)
     char *path, *dist, buf[BUFSIZ];
     const char *tmp;
     FILE *fp;
-    Attribs *dist_attr;
     WINDOW *w = savescr();
     struct timeval start, stop;
     struct sigaction old, new;
@@ -432,7 +431,6 @@ distExtract(char *parent, Distribution *me)
 	 * Try to get distribution as multiple pieces, locating and parsing an
 	 * info file which tells us how many we need for this distribution.
 	 */
-	dist_attr = NULL;
 	numchunks = 0;
 	snprintf(buf, sizeof buf, "%s/%s.inf", path, dist);
 
@@ -457,6 +455,7 @@ distExtract(char *parent, Distribution *me)
 	}
 	else if (fp > 0) {
 	    int status;
+	    Attribs *dist_attr;
 
 	    if (isDebug())
 		msgDebug("Parsing attributes file for distribution %s\n", dist);
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index c84e44c..76d53dc 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.178 1997/03/18 07:02:32 mpp Exp $
+ * $Id: install.c,v 1.134.2.40 1997/03/28 02:25:14 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -498,14 +498,15 @@ installNovice(dialogMenuItem *self)
 		   "may do so by typing: /stand/sysinstall.");
     }
     if (mediaDevice->type != DEVICE_TYPE_FTP && mediaDevice->type != DEVICE_TYPE_NFS) {
-	if (!msgYesNo("Would you like to configure any SLIP/PPP or network interface devices?")) {
+	if (!msgYesNo("Would you like to configure any Ethernet or SLIP/PPP network devices?")) {
 	    Device *tmp;
 
+	    dialog_clear_norefresh();
 	    tmp = tcpDeviceSelect();
+	    dialog_clear_norefresh();
 	    if (tmp && !msgYesNo("Would you like to bring the %s interface up right now?", tmp->name))
 		if (!tmp->init(tmp))
 		    msgConfirm("Initialization of %s device failed.", tmp->name);
-	    dialog_clear_norefresh();
 	}
     }
 
@@ -585,11 +586,13 @@ installNovice(dialogMenuItem *self)
 	configUsers(self);
 
     dialog_clear_norefresh();
-    if (!msgYesNo("Would you like to set the system manager's password now?\n\n"
-		  "This is the password you'll use to log in as \"root\".")) {
+    msgConfirm("Now you must set the system manager's password.\n"
+	       "This is the password you'll use to log in as \"root\".");
+    {
 	WINDOW *w = savescr();
 
-	systemExecute("passwd root");
+	if (!systemExecute("passwd root"))
+	    variable_set2("root_password", "YES");
 	restorescr(w);
     }
 
diff --git a/usr.sbin/sysinstall/installUpgrade.c b/usr.sbin/sysinstall/installUpgrade.c
index 8535e3a..ad53514 100644
--- a/usr.sbin/sysinstall/installUpgrade.c
+++ b/usr.sbin/sysinstall/installUpgrade.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: installUpgrade.c,v 1.45 1997/03/07 16:39:17 jkh Exp $
+ * $Id: installUpgrade.c,v 1.46 1997/03/11 09:29:17 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -70,6 +70,7 @@ static HitList etc_files [] = {
    { JUST_COPY,		"fbtab",		TRUE, NULL },
    { JUST_COPY,		"fstab",		FALSE, NULL },
    { JUST_COPY,		"ftpusers",		TRUE, NULL },
+   { JUST_COPY,		"gettytab",		TRUE, NULL },
    { JUST_COPY,		"gnats",		TRUE, NULL },
    { JUST_COPY,		"group",		FALSE, NULL },
    { JUST_COPY,		"host.conf",		TRUE, NULL },
diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h
index 3f52dc4..bd7e775 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.121 1997/03/15 16:24:32 jkh Exp $
+ * $Id: sysinstall.h,v 1.122 1997/03/19 10:09:26 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -44,7 +44,6 @@
 #include <string.h>
 #include <unistd.h>
 #include <dialog.h>
-#include <dialog.h>
 #include "ui_objects.h"
 #include "dir.h"
 #include "colors.h"