Add a couple of functions to create persistent variables that will

survive a sysinstall Ctrl-C -> 'Restart'.  This fixes another annoying
bug where restarting sysinstall will try to reload kernel modules and
do other external things that have already been done.  For now, use
these persistent variables to keep track of module, usbd, and pccardd
initialization.

Bug found by: rwatson
MFC after:    1 week

1 files changed, 16 insertions, 6 deletions

diff --git a/usr.sbin/sade/main.c b/usr.sbin/sade/main.c
index 19d1c0a..a562029 100644
--- a/usr.sbin/sade/main.c
+++ b/usr.sbin/sade/main.c
@@ -101,14 +101,24 @@ main(int argc, char **argv)
     if (DebugFD)
 	dup2(DebugFD, 2);
 
-    /* Initialize driver modules */
-    moduleInitialize();
+    /* Initialize driver modules, if we haven't already done so (ie,
+       the user hit Ctrl-C -> Restart. */
+    if (!pvariable_get("modulesInitialize")) {
+	moduleInitialize();
+	pvariable_set("modulesInitialize=1");
+    }
 
-    /* Initialize PC-card */
-    pccardInitialize();
+    /* Initialize PC-card, if we haven't already done so. */
+    if (!pvariable_get("pccardInitialize")) {
+	pccardInitialize();
+	pvariable_set("pccardInitialize=1");
+    }
 
-    /* Initialize USB */
-    usbInitialize();
+    /* Initialize USB, if we haven't already done so. */
+    if (!pvariable_get("usbInitialize")) {
+	usbInitialize();
+	pvariable_set("usbInitialize=1");
+    }
 
     /* Probe for all relevant devices on the system */
     deviceGetAll();