Various minor improvements.

10 files changed, 100 insertions, 25 deletions

diff --git a/release/sysinstall/Makefile b/release/sysinstall/Makefile
index 4974832..e333b0a 100644
--- a/release/sysinstall/Makefile
+++ b/release/sysinstall/Makefile
@@ -13,6 +13,8 @@ SRCS=	anonFTP.c apache.c attr.c cdrom.c command.c config.c devices.c \
 
 CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog
 
+CFLAGS+=	-DLOAD_CONFIG_FILE=\"install.cfg\"
+
 DPADD=	${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK}
 LDADD=	-ldialog -lncurses -lmytinfo -lutil -ldisk
 
diff --git a/release/sysinstall/attr.c b/release/sysinstall/attr.c
index a09ef4b..43a45a4 100644
--- a/release/sysinstall/attr.c
+++ b/release/sysinstall/attr.c
@@ -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: attr.c,v 1.6 1996/04/23 01:29:09 jkh Exp $
+ * $Id: attr.c,v 1.7 1996/06/11 05:06:31 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -22,10 +22,10 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY JORDAN HUBBARD ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL JORDAN HUBBARD OR HIS PETS BE LIABLE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR THEIR PETS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, LIFE OR PROFITS; OR BUSINESS INTERRUPTION)
diff --git a/release/sysinstall/main.c b/release/sysinstall/main.c
index 13ffea6..2149899 100644
--- a/release/sysinstall/main.c
+++ b/release/sysinstall/main.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $Id: main.c,v 1.24 1996/07/12 11:14:15 jkh Exp $
+ * $Id: main.c,v 1.25 1996/07/22 18:43:21 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -110,7 +110,33 @@ main(int argc, char **argv)
 	    systemShutdown(0);
     }
 
+/* If we have a compiled-in startup config file name, look for it and try to load it on startup */
+#if defined(LOAD_CONFIG_FILE)
+    else {
+	/* Try to open the floppy drive if we can do that first */
+	if (DITEM_STATUS(mediaSetFloppy(NULL)) != DITEM_FAILURE && mediaDevice->init(mediaDevice)) {
+	    int fd;
+
+	    fd = mediaDevice->get(mediaDevice, LOAD_CONFIG_FILE, TRUE);
+	    if (fd > 0) {
+		Attribs attrs[512];	/* Don't have more than this many attrs in one file, ok? :-) */
+		
+		msgNotify("Loading %s pre-configuration file", LOAD_CONFIG_FILE);
+		if (DITEM_STATUS(attr_parse(attrs, fd)) == DITEM_SUCCESS) {
+		    int i;
+
+		    for (i = 0; attrs[i].name; i++)
+			variable_set2(attrs[i].name, attrs[i].value);
+		}
+		mediaDevice->close(mediaDevice, fd);
+	    }
+	    mediaDevice->shutdown(mediaDevice);
+	}
+    }
+#endif
+ 
     /* Begin user dialog at outer menu */
+    dialog_clear();
     while (1) {
 	choice = scroll = curr = max = 0;
 	dmenuOpen(&MenuInitial, &choice, &scroll, &curr, &max, TRUE);
diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c
index 216e1fc..0f5b0fc 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.83 1996/07/16 17:11:43 jkh Exp $
+ * $Id: menus.c,v 1.84 1996/07/31 06:41:29 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -406,8 +406,8 @@ of the following CDROM drives as your installation drive.",
 DMenu MenuMediaFloppy = {
     DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
     "Choose a Floppy drive",
-    "You have more than one floppy drive.  Please chose the drive\n\
-you would like to use for this operation",
+    "You have more than one floppy drive.  Please chose which drive\n\
+you would like to use.",
     NULL,
     NULL,
     { { NULL } },
@@ -1143,9 +1143,6 @@ the other keymaps below.",
   { "German ISO", "German ISO keymap", dmenuVarCheck, dmenuSetVariable, NULL, "keymap=german.iso" },
   { "Italian", "Italian ISO keymap", dmenuVarCheck, dmenuSetVariable, NULL, "keymap=it.iso" },
   { "Japanese 106", "Japanese 106 keymap",  dmenuVarCheck, dmenuSetVariable, NULL, "keymap=jp.106" },
-  { "Russian CP866", "Russian Code Page 866 keymap", dmenuVarCheck, dmenuSetVariable, NULL, "keymap=ru.cp866" },
-  { "Russian KOI8", "Russian koi8 keymap", dmenuVarCheck, dmenuSetVariable, NULL, "keymap=ru.koi8-r" },
-  { "Russian s-KOI8", "Russian shifted koi8 keymap", dmenuVarCheck, dmenuSetVariable, NULL, "keymap=ru.koi8-r.shift" },
   { "Swedish CP850", "Swedish Code Page 850 keymap", dmenuVarCheck, dmenuSetVariable, NULL, "keymap=swedish.cp850" },
   { "Swedish ISO", "Swedish ISO keymap", dmenuVarCheck, dmenuSetVariable, NULL, "keymap=swedish.iso" },
   { "U.K. CP850", "United Kingdom Code Page 850 keymap", dmenuVarCheck, dmenuSetVariable, NULL, "keymap=uk.cp850" },
diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile
index 4974832..e333b0a 100644
--- a/usr.sbin/sade/Makefile
+++ b/usr.sbin/sade/Makefile
@@ -13,6 +13,8 @@ SRCS=	anonFTP.c apache.c attr.c cdrom.c command.c config.c devices.c \
 
 CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog
 
+CFLAGS+=	-DLOAD_CONFIG_FILE=\"install.cfg\"
+
 DPADD=	${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK}
 LDADD=	-ldialog -lncurses -lmytinfo -lutil -ldisk
 
diff --git a/usr.sbin/sade/main.c b/usr.sbin/sade/main.c
index 13ffea6..2149899 100644
--- a/usr.sbin/sade/main.c
+++ b/usr.sbin/sade/main.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $Id: main.c,v 1.24 1996/07/12 11:14:15 jkh Exp $
+ * $Id: main.c,v 1.25 1996/07/22 18:43:21 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -110,7 +110,33 @@ main(int argc, char **argv)
 	    systemShutdown(0);
     }
 
+/* If we have a compiled-in startup config file name, look for it and try to load it on startup */
+#if defined(LOAD_CONFIG_FILE)
+    else {
+	/* Try to open the floppy drive if we can do that first */
+	if (DITEM_STATUS(mediaSetFloppy(NULL)) != DITEM_FAILURE && mediaDevice->init(mediaDevice)) {
+	    int fd;
+
+	    fd = mediaDevice->get(mediaDevice, LOAD_CONFIG_FILE, TRUE);
+	    if (fd > 0) {
+		Attribs attrs[512];	/* Don't have more than this many attrs in one file, ok? :-) */
+		
+		msgNotify("Loading %s pre-configuration file", LOAD_CONFIG_FILE);
+		if (DITEM_STATUS(attr_parse(attrs, fd)) == DITEM_SUCCESS) {
+		    int i;
+
+		    for (i = 0; attrs[i].name; i++)
+			variable_set2(attrs[i].name, attrs[i].value);
+		}
+		mediaDevice->close(mediaDevice, fd);
+	    }
+	    mediaDevice->shutdown(mediaDevice);
+	}
+    }
+#endif
+ 
     /* Begin user dialog at outer menu */
+    dialog_clear();
     while (1) {
 	choice = scroll = curr = max = 0;
 	dmenuOpen(&MenuInitial, &choice, &scroll, &curr, &max, TRUE);
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index 216e1fc..0f5b0fc 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.83 1996/07/16 17:11:43 jkh Exp $
+ * $Id: menus.c,v 1.84 1996/07/31 06:41:29 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -406,8 +406,8 @@ of the following CDROM drives as your installation drive.",
 DMenu MenuMediaFloppy = {
     DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
     "Choose a Floppy drive",
-    "You have more than one floppy drive.  Please chose the drive\n\
-you would like to use for this operation",
+    "You have more than one floppy drive.  Please chose which drive\n\
+you would like to use.",
     NULL,
     NULL,
     { { NULL } },
@@ -1143,9 +1143,6 @@ the other keymaps below.",
   { "German ISO", "German ISO keymap", dmenuVarCheck, dmenuSetVariable, NULL, "keymap=german.iso" },
   { "Italian", "Italian ISO keymap", dmenuVarCheck, dmenuSetVariable, NULL, "keymap=it.iso" },
   { "Japanese 106", "Japanese 106 keymap",  dmenuVarCheck, dmenuSetVariable, NULL, "keymap=jp.106" },
-  { "Russian CP866", "Russian Code Page 866 keymap", dmenuVarCheck, dmenuSetVariable, NULL, "keymap=ru.cp866" },
-  { "Russian KOI8", "Russian koi8 keymap", dmenuVarCheck, dmenuSetVariable, NULL, "keymap=ru.koi8-r" },
-  { "Russian s-KOI8", "Russian shifted koi8 keymap", dmenuVarCheck, dmenuSetVariable, NULL, "keymap=ru.koi8-r.shift" },
   { "Swedish CP850", "Swedish Code Page 850 keymap", dmenuVarCheck, dmenuSetVariable, NULL, "keymap=swedish.cp850" },
   { "Swedish ISO", "Swedish ISO keymap", dmenuVarCheck, dmenuSetVariable, NULL, "keymap=swedish.iso" },
   { "U.K. CP850", "United Kingdom Code Page 850 keymap", dmenuVarCheck, dmenuSetVariable, NULL, "keymap=uk.cp850" },
diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile
index 4974832..e333b0a 100644
--- a/usr.sbin/sysinstall/Makefile
+++ b/usr.sbin/sysinstall/Makefile
@@ -13,6 +13,8 @@ SRCS=	anonFTP.c apache.c attr.c cdrom.c command.c config.c devices.c \
 
 CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog
 
+CFLAGS+=	-DLOAD_CONFIG_FILE=\"install.cfg\"
+
 DPADD=	${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK}
 LDADD=	-ldialog -lncurses -lmytinfo -lutil -ldisk
 
diff --git a/usr.sbin/sysinstall/main.c b/usr.sbin/sysinstall/main.c
index 13ffea6..2149899 100644
--- a/usr.sbin/sysinstall/main.c
+++ b/usr.sbin/sysinstall/main.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $Id: main.c,v 1.24 1996/07/12 11:14:15 jkh Exp $
+ * $Id: main.c,v 1.25 1996/07/22 18:43:21 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -110,7 +110,33 @@ main(int argc, char **argv)
 	    systemShutdown(0);
     }
 
+/* If we have a compiled-in startup config file name, look for it and try to load it on startup */
+#if defined(LOAD_CONFIG_FILE)
+    else {
+	/* Try to open the floppy drive if we can do that first */
+	if (DITEM_STATUS(mediaSetFloppy(NULL)) != DITEM_FAILURE && mediaDevice->init(mediaDevice)) {
+	    int fd;
+
+	    fd = mediaDevice->get(mediaDevice, LOAD_CONFIG_FILE, TRUE);
+	    if (fd > 0) {
+		Attribs attrs[512];	/* Don't have more than this many attrs in one file, ok? :-) */
+		
+		msgNotify("Loading %s pre-configuration file", LOAD_CONFIG_FILE);
+		if (DITEM_STATUS(attr_parse(attrs, fd)) == DITEM_SUCCESS) {
+		    int i;
+
+		    for (i = 0; attrs[i].name; i++)
+			variable_set2(attrs[i].name, attrs[i].value);
+		}
+		mediaDevice->close(mediaDevice, fd);
+	    }
+	    mediaDevice->shutdown(mediaDevice);
+	}
+    }
+#endif
+ 
     /* Begin user dialog at outer menu */
+    dialog_clear();
     while (1) {
 	choice = scroll = curr = max = 0;
 	dmenuOpen(&MenuInitial, &choice, &scroll, &curr, &max, TRUE);
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index 216e1fc..0f5b0fc 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.83 1996/07/16 17:11:43 jkh Exp $
+ * $Id: menus.c,v 1.84 1996/07/31 06:41:29 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -406,8 +406,8 @@ of the following CDROM drives as your installation drive.",
 DMenu MenuMediaFloppy = {
     DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS,
     "Choose a Floppy drive",
-    "You have more than one floppy drive.  Please chose the drive\n\
-you would like to use for this operation",
+    "You have more than one floppy drive.  Please chose which drive\n\
+you would like to use.",
     NULL,
     NULL,
     { { NULL } },
@@ -1143,9 +1143,6 @@ the other keymaps below.",
   { "German ISO", "German ISO keymap", dmenuVarCheck, dmenuSetVariable, NULL, "keymap=german.iso" },
   { "Italian", "Italian ISO keymap", dmenuVarCheck, dmenuSetVariable, NULL, "keymap=it.iso" },
   { "Japanese 106", "Japanese 106 keymap",  dmenuVarCheck, dmenuSetVariable, NULL, "keymap=jp.106" },
-  { "Russian CP866", "Russian Code Page 866 keymap", dmenuVarCheck, dmenuSetVariable, NULL, "keymap=ru.cp866" },
-  { "Russian KOI8", "Russian koi8 keymap", dmenuVarCheck, dmenuSetVariable, NULL, "keymap=ru.koi8-r" },
-  { "Russian s-KOI8", "Russian shifted koi8 keymap", dmenuVarCheck, dmenuSetVariable, NULL, "keymap=ru.koi8-r.shift" },
   { "Swedish CP850", "Swedish Code Page 850 keymap", dmenuVarCheck, dmenuSetVariable, NULL, "keymap=swedish.cp850" },
   { "Swedish ISO", "Swedish ISO keymap", dmenuVarCheck, dmenuSetVariable, NULL, "keymap=swedish.iso" },
   { "U.K. CP850", "United Kingdom Code Page 850 keymap", dmenuVarCheck, dmenuSetVariable, NULL, "keymap=uk.cp850" },