Wir kehren zurueck zu Kudzu, da hwinfo noch mehr Aerger macht.

[people/teissler/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 9bd629dc10b506377e77f13b2c44cec3dde5db78..cb04955073650c53462d817d585d2cc5226a3c84 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -149,6 +149,7 @@ int main(int argc, char *argv[])
 
        ctr = langtrs[choice];
        strcpy(shortlangname, shortlangnames[choice]);
+       fprintf(flog, "Selected language: %s\n", shortlangname);
 
        mysystem("/bin/setfont lat0-16");
 
@@ -174,6 +175,7 @@ int main(int argc, char *argv[])
 
        // Starting hardware detection
        runcommandwithstatus("/bin/probehw.sh", ctr[TR_PROBING_HARDWARE]);
+       runcommandwithstatus("/bin/probenic.sh install", ctr[TR_PROBING_HARDWARE]);
 
        /* CDROM INSTALL */
        if (installtype == CDROM_INSTALL) {
@@ -499,6 +501,9 @@ int main(int argc, char *argv[])
                
        /* Save USB controller type to modules.conf */
        write_usb_modules_conf();
+       
+       /* Save language und local settings */
+       write_lang_configs(shortlangname);
 
        /* touch the modules.dep files */
        snprintf(commandstring, STRING_SIZE, 
@@ -513,12 +518,6 @@ int main(int argc, char *argv[])
        /* Rename uname */
        rename ("/harddisk/bin/uname.bak", "/harddisk/bin/uname");
 
-       /* *always* write disk configuration */
-       if (!(write_disk_configs(&hdparams))){
-         errorbox(ctr[TR_ERROR_WRITING_CONFIG]);
-         goto EXIT;
-       }
-
        /* mount proc filesystem */
        mysystem("mkdir /harddisk/proc");
        mysystem("/bin/mount -t proc none /harddisk/proc");
@@ -536,7 +535,7 @@ int main(int argc, char *argv[])
        replace("/harddisk/etc/fstab", "DEVICE", hdparams.devnode);
 
        /* if we detected SCSI/USB then fixup */
-       mysystem("/bin/probecntrl.sh");
+/*     mysystem("/bin/probecntrl.sh");
        if ((handle = fopen("/tmp/cntrldriver", "r")))
        {
                char *driver;
@@ -553,7 +552,7 @@ int main(int argc, char *argv[])
                        runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
                        mysystem("/sbin/chroot /harddisk /bin/mv /boot/grub/scsigrub.conf /boot/grub/grub.conf");
                }
-       }
+       } */
 
        if (raid_disk)
                sprintf(string, "root=%sp3", hdparams.devnode);
@@ -619,8 +618,12 @@ EXIT:
                        fclose(flog);
 
                        if (!unattended) {
+                                       // Copy our scanned nics to the disk and lock because scan doesn't work in chroot
+                                       system("touch /harddisk/var/ipfire/ethernet/scan_lock");
+                                       system("cp -f /tmp/scanned_nics /harddisk/var/ipfire/ethernet/scanned_nics");
                            if (system("/sbin/chroot /harddisk /usr/local/sbin/setup /dev/tty2 INSTALL"))
                                    printf("Unable to run setup.\n");
+                                 system("rm -f /harddisk/var/ipfire/ethernet/scan_lock");
                        }
 
                        if (system("/bin/umount /harddisk/proc"))