Padlock-Modul aktiviert fuer VIA Epia Boards

[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 f988a608bb986a8a9923f44c949cf6e0b17f38f2..cb04955073650c53462d817d585d2cc5226a3c84 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -175,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) {
@@ -617,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"))