move some lines around to fix #97055. work around bad choice of variable name which is already used by bash

3 files changed, 33 insertions, 11 deletions

diff --git a/loader2/hardware.c b/loader2/hardware.c
index 24e6d2381..1070869ab 100644
--- a/loader2/hardware.c
+++ b/loader2/hardware.c
@@ -287,7 +287,9 @@ void dasdSetup(moduleList modLoaded, moduleDeps modDeps,
     char **dasd_parms;
     char *line, *ports = NULL;
     char *parms = NULL, *parms_end;
+    char buf[512];
     FILE *fd;
+    int f;
 
     dasd_parms = malloc(sizeof(*dasd_parms) * 2);
     dasd_parms[0] = NULL;
@@ -329,6 +331,23 @@ void dasdSetup(moduleList modLoaded, moduleDeps modDeps,
             strcpy(parms,"dasd=");
             strcat(parms, ports);
             dasd_parms[0] = parms;
+<<<<<<< hardware.c
+            simpleRemoveLoadedModule("dasd_eckd_mod", modLoaded, flags);
+            simpleRemoveLoadedModule("dasd_fba_mod", modLoaded, flags);
+            simpleRemoveLoadedModule("dasd_diag_mod", modLoaded, flags);
+            simpleRemoveLoadedModule("dasd_mod", modLoaded, flags);
+            reloadUnloadedModule("dasd_mod", modLoaded, dasd_parms, flags);
+            reloadUnloadedModule("dasd_eckd_mod", modLoaded, NULL, flags);
+            /* KHFIXME */
+            sprintf(buf, "options dasd_mod %s\n", parms);
+            f = open("/tmp/modules.conf", O_WRONLY | O_CREAT | O_APPEND, 0666);
+            if (f != -1) {
+                write(f, buf, strlen(buf));
+                close(f);
+            }
+        }
+
+=======
             removeLoadedModule("dasd_eckd_mod", modLoaded, flags);
             removeLoadedModule("dasd_fba_mod", modLoaded, flags);
             removeLoadedModule("dasd_diag_mod", modLoaded, flags);
@@ -337,6 +356,7 @@ void dasdSetup(moduleList modLoaded, moduleDeps modDeps,
                          dasd_parms, flags);
             mlLoadModuleSet("dasd_diag_mod:dasd_fba_mod:dasd_eckd_mod", 
                             modLoaded, modDeps, modInfo, flags);
+>>>>>>> 1.9.6.8
             free(dasd_parms);
             free(ports);
         }
diff --git a/loader2/linuxrc.s390 b/loader2/linuxrc.s390
index b20a6abcf..a0ab94f47 100644
--- a/loader2/linuxrc.s390
+++ b/loader2/linuxrc.s390
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (C) 2000,2001,2002 by
+# Copyright (C) 2000-2003 by
 #        Bernhard Rosenkraenzer <bero@redhat.com>
 #        Oliver Paukstadt <opaukstadt@millenux.com>
 #        Karsten Hopp <karsten@redhat.de>
@@ -114,7 +114,7 @@ LO=""
 
 # Parse configuration
 # Check for missing parameters, prompt for them if necessary
-while [ -z "$HOSTNAME" ]; do
+while [ -z "$HOSTNAME" -o "$HOSTNAME" = "(none)" ]; do
 	echo $"Please enter the FQDN of your new Linux guest (e.g. s390.redhat.com):"
 	read HOSTNAME
 done
@@ -160,15 +160,15 @@ if [ ":$NETTYPE" != ":iucv" ]; then   # iucv is the only interface without chand
    [ -n "$QETHPARM" ] && echo "$QETHPARM" >/proc/chandev
 	[ -n "$CHANDEV" ]  && echo "reprobe" >/proc/chandev
 fi
+while [ -z "$IPADDR" ]; do
+  echo $"Please enter the IP address of your new Linux guest:"
+  read IPADDR
+done
+while [ -z "$NETWORK" ]; do
+  echo $"Enter the network address of the new Linux guest:"
+  read NETWORK
+done
 if [ ":$NETTYPE" = ":eth" ] || [ ":$NETTYPE" = ":tr" ] || [ ":$NETTYPE" = ":hsi" ]; then
-	 while [ -z "$IPADDR" ]; do
-		  echo $"Please enter the IP address of your new Linux guest:"
-		  read IPADDR
-	 done
-	 while [ -z "$NETWORK" ]; do
-		  echo $"Enter the network address of the new Linux guest:"
-		  read NETWORK
-	 done
 	 while [ -z "$NETMASK" ]; do
 		  echo $"Enter the netmask for the new Linux guest (e.g. 255.255.255.0):"
 		  read NETMASK
diff --git a/loader2/modules.c b/loader2/modules.c
index b9fad4f38..1e6dd17f2 100644
--- a/loader2/modules.c
+++ b/loader2/modules.c
@@ -582,7 +582,6 @@ static int writeModulesConf(moduleList list, int fd) {
     for (i = 0, lm = list->mods; i < list->numModules; i++, lm++) {
         if (!lm->weLoaded) continue;
         if (lm->written) continue;
-        lm->written = 1;
 
         /* JKFIXME: this is a hack for the fact that these are now
          * DRIVER_SCSI so we can get /tmp/scsidisks, but we don't
@@ -608,6 +607,7 @@ static int writeModulesConf(moduleList list, int fd) {
                 strcat(buf, lm->name);
                 strcat(buf, "\n");
                 write(fd, buf, strlen(buf));
+                lm->written = 1;
 
                 break;
 
@@ -637,6 +637,7 @@ static int writeModulesConf(moduleList list, int fd) {
                 strcat(buf, lm->name);
                 strcat(buf, "\n");
                 write(fd, buf, strlen(buf));
+                lm->written = 1;
 
                 break;
 
@@ -655,6 +656,7 @@ static int writeModulesConf(moduleList list, int fd) {
             }
             strcat(buf, "\n");
             write(fd, buf, strlen(buf));
+            lm->written = 1;
         }
     }