Replace old SAVE_USERCONFIG code with a customized version of Andrzej's

kget code.  Also collapse a redundant case in cdrom code.

13 files changed, 245 insertions, 17 deletions

diff --git a/release/sysinstall/Makefile b/release/sysinstall/Makefile
index 20da649..10e0d6a 100644
--- a/release/sysinstall/Makefile
+++ b/release/sysinstall/Makefile
@@ -9,7 +9,7 @@ CLEANFILES+=	keymap.tmp keymap.h
 
 .PATH: ${.CURDIR}/../disklabel ${.CURDIR}/../../usr.bin/cksum
 
-SRCS=	anonFTP.c cdrom.c command.c config.c devices.c \
+SRCS=	anonFTP.c cdrom.c command.c config.c devices.c kget.c \
 	disks.c dispatch.c dist.c dmenu.c doc.c dos.c floppy.c \
 	ftp.c globals.c index.c install.c installUpgrade.c keymap.c \
 	label.c lndir.c main.c makedevs.c media.c menus.c misc.c mouse.c \
diff --git a/release/sysinstall/cdrom.c b/release/sysinstall/cdrom.c
index f6fe16b..0115202 100644
--- a/release/sysinstall/cdrom.c
+++ b/release/sysinstall/cdrom.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: cdrom.c,v 1.43 1998/10/14 11:23:48 jkh Exp $
+ * $Id: cdrom.c,v 1.44 1998/12/22 12:31:24 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -95,10 +95,8 @@ mediaInitCDROM(Device *dev)
 	    msgConfirm("Error mounting %s on %s: %s (%u)", dev->devname, mountpoint, strerror(errno), errno);
 	    return FALSE;
 	}
-	cdromMounted = TRUE;
     }
-    else
-	cdromMounted = TRUE;
+    cdromMounted = TRUE;
 
     if (!file_readable(string_concat(mountpoint, "/cdrom.inf")) && !bogusCDOK) {
 	if (msgYesNo("Warning: The CD currently in the drive is either not a FreeBSD\n"
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c
index 6b12165..fc1f42e 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.221 1999/01/08 00:14:21 jkh Exp $
+ * $Id: install.c,v 1.222 1999/01/20 11:56:39 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -758,6 +758,11 @@ installFixupBin(dialogMenuItem *self)
 		    msgConfirm("Unable to copy /kernel into place!");
 		    return DITEM_FAILURE;
 		}
+                /* Snapshot any boot -c changes back to the new kernel */
+                if (kget("/kernel.config")) {
+		    msgConfirm("Kernel copied OK, but unable to save boot -c changes\n"
+			       "to it.  See the debug screen (ALT-F2) for details.");
+		}
 	    }
 	    else {
 		msgConfirm("Can't find a kernel image to link to on the root file system!\n"
diff --git a/release/sysinstall/kget.c b/release/sysinstall/kget.c
new file mode 100644
index 0000000..a71a25e
--- /dev/null
+++ b/release/sysinstall/kget.c
@@ -0,0 +1,104 @@
+/*-
+ * Copyright (c) 1999 Andrzej Bialecki <abial@freebsd.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    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 THE AUTHOR AND CONTRIBUTORS ``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 THE AUTHOR OR CONTRIBUTORS 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, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $Id: kget.c,v 1.2 1999/01/19 23:15:56 abial Exp $
+ */
+
+#include "sysinstall.h"
+#include "i386/isa/isa_device.h"
+#include <sys/sysctl.h>
+
+int
+kget(char *out)
+{
+    int len, i, bytes_written = 0;
+    char *buf;
+    char *mib = "machdep.uc_devlist";
+    char name[9];
+    FILE *fout;
+    struct isa_device *id;
+    char *p;
+ 
+    fout = fopen(out, "w");
+    if (fout == NULL) {
+	msgDebug("kget: Unable to open %s for writing.\n", out);
+	return -1;
+    }
+
+    /* We use sysctlbyname, because the oid is unknown (OID_AUTO) */
+    /* get the buffer size */
+    i = sysctlbyname(mib, NULL, &len, NULL, NULL);
+    if (i) {
+	msgDebug("kget: error buffer sizing\n");
+	return -1;
+    }
+    buf = (char *)malloc(len * sizeof(char));
+    i = sysctlbyname(mib, buf, &len, NULL, NULL);
+    if (i) {
+	msgDebug("kget: error retrieving data\n");
+	return -1;
+    }
+    i = 0;
+    while (i < len) {
+	id = (struct isa_device *)(buf + i);
+	p = (buf + i + sizeof(struct isa_device));
+	strncpy(name, p, 8);
+	if (!id->id_enabled) {
+	    bytes_written += fprintf(fout, "di %s%d\n", name, id->id_unit);
+	} else {
+	    bytes_written += fprintf(fout, "en %s%d\n", name, id->id_unit);
+	    if (id->id_iobase > 0) {
+		bytes_written += fprintf(fout, "po %s%d %#x\n",
+					 name, id->id_unit, id->id_iobase);
+	    }
+	    if (id->id_irq > 0) {
+		bytes_written += fprintf(fout, "ir %s%d %d\n", name,
+					 id->id_unit, ffs(id->id_irq) - 1);
+	    }
+	    if (id->id_drq > 0) {
+		bytes_written += fprintf(fout, "dr %s%d %d\n", name,
+					 id->id_unit, id->id_drq);
+	    }
+	    if (id->id_maddr > 0) {
+		bytes_written += fprintf(fout, "iom %s%d %#x\n", name,
+					 id->id_unit, (u_int)id->id_maddr);
+	    }
+	    if (id->id_msize > 0) {
+		bytes_written += fprintf(fout, "ios %s%d %d\n", name,
+					 id->id_unit, id->id_msize);
+	    }
+	    bytes_written += fprintf(fout, "f %s%d %#x\n", name,
+				     id->id_unit, id->id_flags);
+	}
+	i += sizeof(struct isa_device) + 8;
+    }
+    if (bytes_written)
+	fprintf(fout, "q\n");
+    else
+        unlink(out);
+    fclose(fout);
+    free(buf);
+    return 0;
+}
diff --git a/release/sysinstall/sysinstall.h b/release/sysinstall/sysinstall.h
index 2b027b0..a50eb3e 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.151 1998/11/24 00:18:56 jkh Exp $
+ * $Id: sysinstall.h,v 1.152 1998/12/22 12:31:25 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -539,6 +539,9 @@ extern int	installVarDefaults(dialogMenuItem *self);
 extern void	installEnvironment(void);
 extern Boolean	copySelf(void);
 
+/* kget.c */
+extern int	kget(char *out);
+
 /* keymap.c */
 extern int	loadKeymap(const char *lang);
 
diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile
index 20da649..10e0d6a 100644
--- a/usr.sbin/sade/Makefile
+++ b/usr.sbin/sade/Makefile
@@ -9,7 +9,7 @@ CLEANFILES+=	keymap.tmp keymap.h
 
 .PATH: ${.CURDIR}/../disklabel ${.CURDIR}/../../usr.bin/cksum
 
-SRCS=	anonFTP.c cdrom.c command.c config.c devices.c \
+SRCS=	anonFTP.c cdrom.c command.c config.c devices.c kget.c \
 	disks.c dispatch.c dist.c dmenu.c doc.c dos.c floppy.c \
 	ftp.c globals.c index.c install.c installUpgrade.c keymap.c \
 	label.c lndir.c main.c makedevs.c media.c menus.c misc.c mouse.c \
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 6b12165..fc1f42e 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.221 1999/01/08 00:14:21 jkh Exp $
+ * $Id: install.c,v 1.222 1999/01/20 11:56:39 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -758,6 +758,11 @@ installFixupBin(dialogMenuItem *self)
 		    msgConfirm("Unable to copy /kernel into place!");
 		    return DITEM_FAILURE;
 		}
+                /* Snapshot any boot -c changes back to the new kernel */
+                if (kget("/kernel.config")) {
+		    msgConfirm("Kernel copied OK, but unable to save boot -c changes\n"
+			       "to it.  See the debug screen (ALT-F2) for details.");
+		}
 	    }
 	    else {
 		msgConfirm("Can't find a kernel image to link to on the root file system!\n"
diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h
index 2b027b0..a50eb3e 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.151 1998/11/24 00:18:56 jkh Exp $
+ * $Id: sysinstall.h,v 1.152 1998/12/22 12:31:25 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -539,6 +539,9 @@ extern int	installVarDefaults(dialogMenuItem *self);
 extern void	installEnvironment(void);
 extern Boolean	copySelf(void);
 
+/* kget.c */
+extern int	kget(char *out);
+
 /* keymap.c */
 extern int	loadKeymap(const char *lang);
 
diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile
index 20da649..10e0d6a 100644
--- a/usr.sbin/sysinstall/Makefile
+++ b/usr.sbin/sysinstall/Makefile
@@ -9,7 +9,7 @@ CLEANFILES+=	keymap.tmp keymap.h
 
 .PATH: ${.CURDIR}/../disklabel ${.CURDIR}/../../usr.bin/cksum
 
-SRCS=	anonFTP.c cdrom.c command.c config.c devices.c \
+SRCS=	anonFTP.c cdrom.c command.c config.c devices.c kget.c \
 	disks.c dispatch.c dist.c dmenu.c doc.c dos.c floppy.c \
 	ftp.c globals.c index.c install.c installUpgrade.c keymap.c \
 	label.c lndir.c main.c makedevs.c media.c menus.c misc.c mouse.c \
diff --git a/usr.sbin/sysinstall/cdrom.c b/usr.sbin/sysinstall/cdrom.c
index f6fe16b..0115202 100644
--- a/usr.sbin/sysinstall/cdrom.c
+++ b/usr.sbin/sysinstall/cdrom.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: cdrom.c,v 1.43 1998/10/14 11:23:48 jkh Exp $
+ * $Id: cdrom.c,v 1.44 1998/12/22 12:31:24 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -95,10 +95,8 @@ mediaInitCDROM(Device *dev)
 	    msgConfirm("Error mounting %s on %s: %s (%u)", dev->devname, mountpoint, strerror(errno), errno);
 	    return FALSE;
 	}
-	cdromMounted = TRUE;
     }
-    else
-	cdromMounted = TRUE;
+    cdromMounted = TRUE;
 
     if (!file_readable(string_concat(mountpoint, "/cdrom.inf")) && !bogusCDOK) {
 	if (msgYesNo("Warning: The CD currently in the drive is either not a FreeBSD\n"
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 6b12165..fc1f42e 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.221 1999/01/08 00:14:21 jkh Exp $
+ * $Id: install.c,v 1.222 1999/01/20 11:56:39 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -758,6 +758,11 @@ installFixupBin(dialogMenuItem *self)
 		    msgConfirm("Unable to copy /kernel into place!");
 		    return DITEM_FAILURE;
 		}
+                /* Snapshot any boot -c changes back to the new kernel */
+                if (kget("/kernel.config")) {
+		    msgConfirm("Kernel copied OK, but unable to save boot -c changes\n"
+			       "to it.  See the debug screen (ALT-F2) for details.");
+		}
 	    }
 	    else {
 		msgConfirm("Can't find a kernel image to link to on the root file system!\n"
diff --git a/usr.sbin/sysinstall/kget.c b/usr.sbin/sysinstall/kget.c
new file mode 100644
index 0000000..a71a25e
--- /dev/null
+++ b/usr.sbin/sysinstall/kget.c
@@ -0,0 +1,104 @@
+/*-
+ * Copyright (c) 1999 Andrzej Bialecki <abial@freebsd.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    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 THE AUTHOR AND CONTRIBUTORS ``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 THE AUTHOR OR CONTRIBUTORS 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, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $Id: kget.c,v 1.2 1999/01/19 23:15:56 abial Exp $
+ */
+
+#include "sysinstall.h"
+#include "i386/isa/isa_device.h"
+#include <sys/sysctl.h>
+
+int
+kget(char *out)
+{
+    int len, i, bytes_written = 0;
+    char *buf;
+    char *mib = "machdep.uc_devlist";
+    char name[9];
+    FILE *fout;
+    struct isa_device *id;
+    char *p;
+ 
+    fout = fopen(out, "w");
+    if (fout == NULL) {
+	msgDebug("kget: Unable to open %s for writing.\n", out);
+	return -1;
+    }
+
+    /* We use sysctlbyname, because the oid is unknown (OID_AUTO) */
+    /* get the buffer size */
+    i = sysctlbyname(mib, NULL, &len, NULL, NULL);
+    if (i) {
+	msgDebug("kget: error buffer sizing\n");
+	return -1;
+    }
+    buf = (char *)malloc(len * sizeof(char));
+    i = sysctlbyname(mib, buf, &len, NULL, NULL);
+    if (i) {
+	msgDebug("kget: error retrieving data\n");
+	return -1;
+    }
+    i = 0;
+    while (i < len) {
+	id = (struct isa_device *)(buf + i);
+	p = (buf + i + sizeof(struct isa_device));
+	strncpy(name, p, 8);
+	if (!id->id_enabled) {
+	    bytes_written += fprintf(fout, "di %s%d\n", name, id->id_unit);
+	} else {
+	    bytes_written += fprintf(fout, "en %s%d\n", name, id->id_unit);
+	    if (id->id_iobase > 0) {
+		bytes_written += fprintf(fout, "po %s%d %#x\n",
+					 name, id->id_unit, id->id_iobase);
+	    }
+	    if (id->id_irq > 0) {
+		bytes_written += fprintf(fout, "ir %s%d %d\n", name,
+					 id->id_unit, ffs(id->id_irq) - 1);
+	    }
+	    if (id->id_drq > 0) {
+		bytes_written += fprintf(fout, "dr %s%d %d\n", name,
+					 id->id_unit, id->id_drq);
+	    }
+	    if (id->id_maddr > 0) {
+		bytes_written += fprintf(fout, "iom %s%d %#x\n", name,
+					 id->id_unit, (u_int)id->id_maddr);
+	    }
+	    if (id->id_msize > 0) {
+		bytes_written += fprintf(fout, "ios %s%d %d\n", name,
+					 id->id_unit, id->id_msize);
+	    }
+	    bytes_written += fprintf(fout, "f %s%d %#x\n", name,
+				     id->id_unit, id->id_flags);
+	}
+	i += sizeof(struct isa_device) + 8;
+    }
+    if (bytes_written)
+	fprintf(fout, "q\n");
+    else
+        unlink(out);
+    fclose(fout);
+    free(buf);
+    return 0;
+}
diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h
index 2b027b0..a50eb3e 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.151 1998/11/24 00:18:56 jkh Exp $
+ * $Id: sysinstall.h,v 1.152 1998/12/22 12:31:25 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -539,6 +539,9 @@ extern int	installVarDefaults(dialogMenuItem *self);
 extern void	installEnvironment(void);
 extern Boolean	copySelf(void);
 
+/* kget.c */
+extern int	kget(char *out);
+
 /* keymap.c */
 extern int	loadKeymap(const char *lang);