Setup weiter ausgebaut.

[people/pmueller/ipfire-2.x.git] / src / install+setup / install / main.c

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index bbda982cff2fc854bccbdaad5c91d290424d93c1..309f225ad3a93c2cfb5d4d9deedb8e5ff45f0922 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -142,28 +142,27 @@ int main(int argc, char *argv[])
        {
                fprintf(flog, "Couldn't open commandline: /proc/cmdline\n");
        } else {
-               mysystem("/sbin/modprobe ide-generic");
-               mysystem("/sbin/modprobe generic");
-               mysystem("/sbin/modprobe ide-cd");
-               mysystem("/sbin/modprobe ide-disk");
-               mysystem("/sbin/modprobe sd_mod");
-               mysystem("/sbin/modprobe sr_mod");
-               mysystem("/sbin/modprobe usb-storage");
-               
                fgets(line, STRING_SIZE, cmdfile);
                
                // check if we have to make an unattended install
                if (strstr (line, "unattended") != NULL) {
                    unattended = 1;
-               }
-               mysystem("/sbin/modprobe iso9660"); // CDROM
-               mysystem("/sbin/modprobe ext2"); // Boot patition
-               mysystem("/sbin/modprobe vfat"); // USB key
-       }
-
-       if (unattended) {
-           runcommandwithstatus("/bin/sleep 10", "WARNING: Unattended installation will start in 10 seconds...");
-       }
+                   runcommandwithstatus("/bin/sleep 10", "WARNING: Unattended installation will start in 10 seconds...");
+               }               
+       }
+
+       mysystem("/sbin/modprobe ide-generic");
+       mysystem("/sbin/modprobe generic");
+       mysystem("/sbin/modprobe ide-cd");
+       mysystem("/sbin/modprobe ide-disk");
+       mysystem("/sbin/modprobe sd_mod");
+       mysystem("/sbin/modprobe sr_mod");
+       mysystem("/sbin/modprobe usb-storage");
+       mysystem("/sbin/modprobe usbhid");
+
+       mysystem("/sbin/modprobe iso9660"); // CDROM
+       mysystem("/sbin/modprobe ext2"); // Boot patition
+       mysystem("/sbin/modprobe vfat"); // USB key
        
        /* German is the default */
        for (choice = 0; langnames[choice]; choice++)
@@ -181,12 +180,14 @@ int main(int argc, char *argv[])
 
        ctr = langtrs[choice];
        strcpy(shortlangname, shortlangnames[choice]);
-       fprintf(flog, "Selected language: %s\n", shortlangname);
 
        newtDrawRootText(14, 0, NAME " " VERSION " - " SLOGAN );
        newtPushHelpLine(ctr[TR_HELPLINE]);
        sprintf (title, "%s %s - %s", NAME, VERSION, SLOGAN);
 
+       // Starting hardware detection
+       runcommandwithstatus("/bin/probehw.sh", ctr[TR_PROBING_HARDWARE]);
+
        if (!unattended) {
                sprintf(message, ctr[TR_WELCOME], NAME);
                newtWinMessage(title, ctr[TR_OK], message);
@@ -203,9 +204,6 @@ int main(int argc, char *argv[])
        if (rc == 2)
                goto EXIT;
 
-       // Starting hardware detection
-       runcommandwithstatus("/bin/probehw.sh", ctr[TR_PROBING_HARDWARE]);
-
        /* CDROM INSTALL */
        if (installtype == CDROM_INSTALL) {
                switch (mysystem("/bin/mountsource.sh")) {