]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blobdiff - src/install+setup/install/main.c
Imported french install lang from "IfXen" and add it to build.
[people/pmueller/ipfire-2.x.git] / src / install+setup / install / main.c
index 794f027fe2124381001ffac0833fac6f7fde2283..fc339591ba923e10f5f37623483c63dafa347beb 100644 (file)
@@ -4,20 +4,20 @@
  * Licence.  See the file COPYING for details.
  *
  * (c) Lawrence Manning, 2001
- * Contains main entry point, and misc functions.
+ * Contains main entry point, and misc functions.6
  * 
  */
 
 #include "install.h"
 #define _GNU_SOURCE
  
-#define CDROM_INSTALL 0
-#define URL_INSTALL 1
-#define DISK_INSTALL 2
-#define INST_FILECOUNT 7000
+#define INST_FILECOUNT 6200
 #define UNATTENDED_CONF "/cdrom/boot/unattended.conf"
 
-int raid_disk = 0;
+#define REISER4 0
+#define REISERFS 1
+#define EXT3 2
+
 FILE *flog = NULL;
 char *mylog;
 
@@ -25,65 +25,41 @@ char **ctr;
 
 extern char url[STRING_SIZE];
 
-struct  nic  nics[20] = { { "" , "" } }; // only defined for compile
-struct knic knics[20] = { { "" , "" , "" } }; // only defined for compile
+struct  nic  nics[20] = { { "" , "" , "" } }; // only defined for compile
+struct knic knics[20] = { { "" , "" , "" , "" } }; // only defined for compile
 
 extern char *en_tr[];
 extern char *de_tr[];
-
-int detect_smp() {
-       FILE *fd = NULL;
-       char line[STRING_SIZE];
-       int cpu_count = 0;
-
-       if ((fd = fopen("/proc/cpuinfo", "r")) == NULL) {
-               return 0;
-       }
-       while (fgets(line, STRING_SIZE, fd) != NULL) {
-               if (strstr(line, "processor") == line) {
-                       cpu_count++;
-               }
-       }
-       (void)fclose(fd);
-       return (cpu_count > 1);
-}
-
-long calc_swapsize(long memory, long disk) {
-       if (memory < 128) {
-               return 256;
-       }
-       if (memory > 1024) {
-               return 512;
-       }
-
-       return memory*2;
-}
+extern char *fr_tr[];
 
 int main(int argc, char *argv[])
 {
-       char *langnames[] = { "Deutsch", "English", NULL };
-       char *shortlangnames[] = { "de", "en", NULL };
-       char **langtrs[] = { de_tr, en_tr, NULL };
+       char *langnames[] = { "Deutsch", "English", "Francais", NULL };
+       char *shortlangnames[] = { "de", "en", "fr" ,NULL };
+       char **langtrs[] = { de_tr, en_tr, fr_tr,NULL };
        char hdletter;
-       char harddrive[5], sourcedrive[5];      /* Device holder. */
+       char harddrive[30], sourcedrive[5];     /* Device holder. */
        struct devparams hdparams, cdromparams; /* Params for CDROM and HD */
-       int cdmounted = 0; /* Loop flag for inserting a cd. */
        int rc = 0;
        char commandstring[STRING_SIZE];
-       char *installtypes[] = { "CDROM/USB", "HTTP/FTP", NULL };
-       int installtype = CDROM_INSTALL;
+       char mkfscommand[STRING_SIZE];
+       char *fstypes[] = { "Reiser4", "ReiserFS", "ext3", NULL };
+       int fstype = REISERFS;
        int choice;
+       int i;
+       int found = 0;
+       int firstrun = 0;
        char shortlangname[10];
        char message[1000];
        char title[STRING_SIZE];
        int allok = 0;
        int allok_fastexit=0;
+       int raid_disk = 0;
        struct keyvalue *ethernetkv = initkeyvalues();
        FILE *handle, *cmdfile;
        char line[STRING_SIZE];
        char string[STRING_SIZE];
-       long maximum_free = 0, current_free;
-       long memory = 0;
+       long memory = 0, disk = 0, free;
        long system_partition, boot_partition, root_partition, swap_file;
        int scsi_disk = 0;
        char *yesnoharddisk[3]; //      char *yesnoharddisk = { "NO", "YES", NULL };
@@ -91,6 +67,7 @@ int main(int argc, char *argv[])
        int unattended = 0;
        struct keyvalue *unattendedkv = initkeyvalues();
        int hardyn = 0;
+       char restore_file[STRING_SIZE] = "";
 
        setlocale (LC_ALL, "");
        sethostname( SNAME , 10);
@@ -114,27 +91,46 @@ int main(int argc, char *argv[])
        newtInit();
        newtCls();
 
-       /* Do usb detection first for usb keyboard */
+       newtDrawRootText(14, 0, NAME " " VERSION " - " SLOGAN );
+       sprintf (title, "%s %s - %s", NAME, VERSION, SLOGAN);
+
        if (! (cmdfile = fopen("/proc/cmdline", "r")))
        {
                fprintf(flog, "Couldn't open commandline: /proc/cmdline\n");
        } else {
                fgets(line, STRING_SIZE, cmdfile);
-               if (strstr (line, "nousb") == NULL) {
-                       fprintf(flog, "Initializing USB controllers.\n");
-                       initialize_usb();
-               } else {
-                       fprintf(flog, "Skipping USB detection.\n");
-               }
+               
                // check if we have to make an unattended install
-               if (strstr (line, "unattended") != NULL) {              
+               if (strstr (line, "unattended") != NULL) {
                    unattended = 1;
-               }
+                   runcommandwithstatus("/bin/sleep 10", "WARNING: Unattended installation will start in 10 seconds...");
+               }               
        }
 
-       if (unattended) {
-           runcommandwithstatus("/bin/sleep 10", "WARNING: Unattended installation will start in 10 seconds...");
-       }
+       // Load ata-piix prior kudzu because kudzu use ata-generic for ich7
+       mysystem("/sbin/modprobe ata_piix");
+
+       // Starting hardware detection
+       runcommandwithstatus("/bin/probehw.sh", "Probing Hardware ...");
+
+       // Load common modules
+       mysystem("/sbin/modprobe ide-generic");
+       mysystem("/sbin/modprobe ide-cd");
+       mysystem("/sbin/modprobe ide-disk");
+       mysystem("/sbin/modprobe uhci-hcd");
+       mysystem("/sbin/modprobe ohci-hcd");
+       mysystem("/sbin/modprobe ehci-hcd");
+       mysystem("/sbin/modprobe ohci1394");
+       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
+
+       runcommandwithstatus("/bin/sleep 10", "Waiting for USB Hardware ...");
        
        /* German is the default */
        for (choice = 0; langnames[choice]; choice++)
@@ -146,137 +142,80 @@ int main(int argc, char *argv[])
                goto EXIT;
 
        if (!unattended) {
-           rc = newtWinMenu("Language selection",
-                   "Select the language you wish to use for the " NAME ".", 50, 5, 5, 8,
+           rc = newtWinMenu("Language selection", "Select the language you wish to use for the " NAME ".", 50, 5, 5, 8,
                    langnames, &choice, "Ok", NULL);
        }
 
        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);
 
-       if (!unattended) {
-               sprintf(message, ctr[TR_WELCOME], NAME);
-               newtWinMessage(title, ctr[TR_OK], message);
+       sprintf(message, ctr[TR_WELCOME], NAME);
+       newtWinMessage(title, ctr[TR_OK], message);
 
-               sprintf(message, ctr[TR_SELECT_INSTALLATION_MEDIA_LONG], NAME);
-               rc = newtWinMenu(ctr[TR_SELECT_INSTALLATION_MEDIA], message,
-                       50, 5, 5, 6, installtypes, &installtype, ctr[TR_OK],
-                       ctr[TR_CANCEL], NULL);
-       } else {
-           rc = 1;
-           installtype = CDROM_INSTALL;
+       switch (mysystem("/bin/mountsource.sh")) {
+           case 0:
+                               break;
+           case 10:
+       errorbox(ctr[TR_NO_CDROM]);
+               goto EXIT;
        }
 
-       if (rc == 2)
+       /* read source drive letter */
+       if ((handle = fopen("/tmp/source_device", "r")) == NULL) {
+               errorbox(ctr[TR_ERROR_PROBING_CDROM]);
                goto EXIT;
-
-       // 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) {
-               switch (mysystem("/bin/mountsource.sh")) {
-                   case 0:
-                       installtype = CDROM_INSTALL;
-                       cdmounted = 1;
-                       break;
-                   case 1:
-                       installtype = DISK_INSTALL;
-                       break;
-                   case 10:
-                       errorbox(ctr[TR_NO_CDROM]);
-                       goto EXIT;
-               }
-
-               /* read source drive letter */
-               if ((handle = fopen("/tmp/source_device", "r")) == NULL) {
-                       errorbox(ctr[TR_ERROR_PROBING_CDROM]);
-                       goto EXIT;
-               }
-               fgets(sourcedrive, 5, handle);
-               fprintf(flog, "Source drive: %s\n", sourcedrive);
-               fclose(handle);
-
-               //snprintf(cdromparams.devnode_disk, STRING_SIZE, "/dev/%s", sourcedrive);
-               fprintf(flog, "Source device: %s\n", sourcedrive);
        }
-
-       /* Configure the network now! */
-       if (installtype == URL_INSTALL) {
-               /* Network driver and params. */
-               if (!(networkmenu(ethernetkv))) {
-                       errorbox(ctr[TR_NETWORK_SETUP_FAILED]);
-                       goto EXIT;
-               }
-
-               /* Check for ipfire-<VERSION>.tbz2 */
-               if (checktarball(SNAME "-" VERSION ".tbz2", ctr[TR_ENTER_URL])) {
-                       errorbox(ctr[TR_NO_IPCOP_TARBALL_FOUND]);
-                       goto EXIT;
+       fgets(sourcedrive, 5, handle);
+       fprintf(flog, "Source drive: %s\n", sourcedrive);
+       fclose(handle);
+       
+       i = 0;
+       while (found == 0) {
+               i++;
+               fprintf(flog, "Harddisk scan pass %i\n", i);
+
+               switch (mysystem("/bin/mountdest.sh") % 255) {
+                       case 0: // Found IDE disk
+                               scsi_disk = 0;
+                               raid_disk = 0;
+                               found = 1;
+                               break;
+                       case 1: // Found SCSI disk
+                               scsi_disk = 1;
+                               raid_disk = 0;
+                               found = 1;
+                               break;
+                       case 2: // Found RAID disk
+                               scsi_disk = 0;
+                               raid_disk= 1;
+                               found = 1;
+                               break;
+                       case 10: // No harddisk found
+                               if (firstrun == 1) {
+                                       errorbox(ctr[TR_NO_HARDDISK]);
+                                       goto EXIT;
+                               }
+                               // Do this if the kudzu-scan fails...
+                               runcommandwithstatus("/bin/probehw.sh deep-scan", ctr[TR_PROBING_HARDWARE]);
+                               firstrun = 1;
                }
        }
 
-       // Now try to find destination device...
-       if ((hdletter = findidetype(IDE_HD))) {
-               sprintf(harddrive, "hd%c", hdletter);
-               goto FOUND_DESTINATION;
+       if ((handle = fopen("/tmp/dest_device", "r")) == NULL) {
+               errorbox(ctr[TR_NO_HARDDISK]);
+               goto EXIT;
        }
-       
-       /* Need to clean this up at some point
-          scsi disk is sdb/sdc when sda/sdb is used for usb-key
-          if scsi-disk is sdd or more, it is not discovered
-          Support only 2 usb keys, none could be unplugged */
-       if (checkusb("sdb") && try_scsi("sdc")) {
-               scsi_disk = 1;
-               sprintf(harddrive, "sdc");
-               goto FOUND_DESTINATION;
-       }
-       if (checkusb("sda") && try_scsi("sdb")) {
-               scsi_disk = 1;
-               sprintf(harddrive, "sdb");
-               goto FOUND_DESTINATION;
-       }
-       if (try_scsi("sda")) {
-               scsi_disk = 1;
-               sprintf(harddrive, "sda");
-               goto FOUND_DESTINATION;
-       }
-       if (try_scsi("ida/c0d0")) {
-               raid_disk = 1;
-               sprintf(harddrive, "ida/c0d0");
-               goto FOUND_DESTINATION;
-       }
-       if (try_scsi("cciss/c0d0")) {
-               raid_disk = 1;
-               sprintf(harddrive, "cciss/c0d0");
-               goto FOUND_DESTINATION;
-       }
-       if (try_scsi("rd/c0d0")) {
-               raid_disk = 1;
-               sprintf(harddrive, "rd/c0d0");
-               goto FOUND_DESTINATION;
-       }
-       if (try_scsi("ataraid/d0")) {
-               raid_disk = 1;
-               sprintf(harddrive, "ataraid/d0");
-               goto FOUND_DESTINATION;
-       }
-       /* nothing worked, give up */
-       errorbox(ctr[TR_NO_HARDDISK]);
-       goto EXIT;
-
-       FOUND_DESTINATION:
+       fgets(harddrive, 30, handle);
+       fclose(handle);
+                       
        /* load unattended configuration */
        if (unattended) {
            fprintf(flog, "unattended: Reading unattended.conf\n");
 
            (void) readkeyvalues(unattendedkv, UNATTENDED_CONF);
+           findkey(unattendedkv, "RESTORE_FILE", restore_file);            
        }
        
        /* Make the hdparms struct and print the contents.
@@ -301,12 +240,12 @@ int main(int argc, char *argv[])
        sprintf(message, ctr[TR_PREPARE_HARDDISK], hdparams.devnode_disk);
        if (unattended) {
            hardyn = 1;
+       } else {
+               yesnoharddisk[0] = ctr[TR_NO];
+               yesnoharddisk[1] = ctr[TR_YES];
+               yesnoharddisk[2] = NULL;
        }
 
-       yesnoharddisk[0] = ctr[TR_NO];
-       yesnoharddisk[1] = ctr[TR_YES];
-       yesnoharddisk[2] = NULL;
-
        while (! hardyn) {
                rc = newtWinMenu(title, message,
                                 50, 5, 5, 6, yesnoharddisk,
@@ -318,6 +257,18 @@ int main(int argc, char *argv[])
        if (rc == 2)
                goto EXIT;
 
+       if (!unattended) {              
+               sprintf(message, ctr[TR_CHOOSE_FILESYSTEM]);
+               rc = newtWinMenu( ctr[TR_CHOOSE_FILESYSTEM], message,
+                       50, 5, 5, 6, fstypes, &fstype, ctr[TR_OK],
+                       ctr[TR_CANCEL], NULL);
+       } else {
+           rc = 1;
+           fstype = REISERFS;
+       }
+       if (rc == 2)
+               goto EXIT;
+
        /* Calculate amount of memory in machine */
         if ((handle = fopen("/proc/meminfo", "r")))
         {
@@ -339,67 +290,71 @@ int main(int argc, char *argv[])
        system(commandstring);
 
        /* Calculate amount of disk space */
-        if ((handle = fopen("/tmp/disksize", "r")))
-        {
-               fgets(line, STRING_SIZE-1, handle);
-               if (sscanf (line, "%s", string)) {
-                       maximum_free = atoi(string) / 1024;
-               }
-               fclose(handle);
-        }
+       if ((handle = fopen("/tmp/disksize", "r"))) {
+               fgets(line, STRING_SIZE-1, handle);
+               if (sscanf (line, "%s", string)) {
+                       disk = atoi(string) / 1024;
+               }
+               fclose(handle);
+       }
        
-       fprintf(flog, "maximum_free = %ld, memory = %ld", 
-               maximum_free, memory);
+       fprintf(flog, "Disksize = %ld, memory = %ld", disk, memory);
        
-       swap_file = calc_swapsize(memory, maximum_free);
-
-       if (maximum_free < 512 + swap_file ) {
-               if (maximum_free < 512) {
-                       errorbox(ctr[TR_DISK_TOO_SMALL]);
-                       goto EXIT;
-               }
-
-               if (!unattended) {
-                   rc = newtWinChoice(title, ctr[TR_OK], ctr[TR_CANCEL], ctr[TR_CONTINUE_NO_SWAP]);
-               }
-               else {
-                   rc = 1;
-               }
+        /* Calculating Swap-Size dependend of Ram Size */
+       if (memory < 128)
+               swap_file = 32;
+       else if (memory >= 1024)
+               swap_file = 512;
+       else 
+               swap_file = memory;
+       
+  /* Calculating Root-Size dependend of Max Disk Space */
+  if ( disk < 756 )
+               root_partition = 200;
+       else if ( disk >= 756 && disk <= 3072 )
+               root_partition = 512;
+       else 
+               root_partition = 2048;
                
-               if (rc != 1)
-                       goto EXIT;
-               swap_file = 0;
-       }
-
+       
+  /* Calculating the amount of free space */
        boot_partition = 20; /* in MB */
-       current_free = maximum_free - boot_partition - swap_file;
-
-       root_partition = 2048 ;
-       if (current_free < 512) {
-               errorbox(ctr[TR_DISK_TOO_SMALL]);
-               goto EXIT;
-       }
-
-       current_free = current_free - root_partition;
-       if (!swap_file) {
-               root_partition = root_partition + swap_file;
-       }
-
-       system_partition = current_free;
-
-       fprintf(flog, "boot = %ld, swap = %ld, mylog = %ld, root = %ld\n",
-               boot_partition, swap_file, system_partition, root_partition);
-
+       system_partition = disk - ( root_partition + swap_file + boot_partition );
+       
+       fprintf(flog, ", boot = %ld, swap = %ld, mylog = %ld, root = %ld\n",
+       boot_partition, swap_file, system_partition, root_partition);
+       rc = 0;
+
+       if ( (!unattended) && (((disk - (root_partition + swap_file + boot_partition)) < 256 ) && ((disk - (root_partition + boot_partition )) > 256)) ) {
+   rc = newtWinChoice(title, ctr[TR_OK], ctr[TR_CANCEL], ctr[TR_CONTINUE_NO_SWAP]);
+    if (rc == 1){
+      swap_file = 0;
+      system_partition = disk - ( root_partition + swap_file + boot_partition );
+      fprintf(flog, "Changing Swap Size to 0 MB.\n");
+    }
+    else if (rc == 2){
+    fprintf(flog, "Disk is too small.\n");
+    errorbox(ctr[TR_DISK_TOO_SMALL]);goto EXIT;
+    }
+  } 
+  else if (disk - (root_partition + swap_file + boot_partition) >= 256) {
+  
+  }
+  else {
+   fprintf(flog, "Disk is too small.\n");
+   errorbox(ctr[TR_DISK_TOO_SMALL]);goto EXIT;
+  }
+        
        handle = fopen("/tmp/partitiontable", "w");
 
        /* Make swapfile */
-       if (swap_file) {
-               fprintf(handle, ",%ld,L,*\n,%ld,S,\n,%ld,L,\n,,L,\n",
-                       boot_partition, swap_file, root_partition);
-       } else {
-               fprintf(handle, ",%ld,L,*\n,0,0,\n,%ld,L,\n,,L,\n",
-                       boot_partition, root_partition);
-       }
+  if (swap_file) {
+     fprintf(handle, ",%ld,L,*\n,%ld,S,\n,%ld,L,\n,,L,\n",
+     boot_partition, swap_file, root_partition);
+  } else {
+     fprintf(handle, ",%ld,L,*\n,0,0,\n,%ld,L,\n,,L,\n",
+     boot_partition, root_partition);
+  }
 
        fclose(handle);
 
@@ -409,10 +364,19 @@ int main(int argc, char *argv[])
                errorbox(ctr[TR_UNABLE_TO_PARTITION]);
                goto EXIT;
        }
-
-       mysystem("/sbin/udevstart");
-
-       snprintf(commandstring, STRING_SIZE, "/bin/mke2fs -T ext2 -c %s1", hdparams.devnode_part);
+       
+       if (fstype == REISER4) {
+               mysystem("/sbin/modprobe reiser4");
+               sprintf(mkfscommand, "/sbin/mkfs.reiser4 -y");
+       } else if (fstype == REISERFS) {
+               mysystem("/sbin/modprobe reiserfs");
+               sprintf(mkfscommand, "/sbin/mkreiserfs -f");
+       } else if (fstype == EXT3) {
+               mysystem("/sbin/modprobe ext3");
+               sprintf(mkfscommand, "/sbin/mke2fs -T ext3 -c");
+       }
+
+       snprintf(commandstring, STRING_SIZE, "/sbin/mke2fs -T ext2 -c %s1", hdparams.devnode_part);
        if (runcommandwithstatus(commandstring, ctr[TR_MAKING_BOOT_FILESYSTEM]))
        {
                errorbox(ctr[TR_UNABLE_TO_MAKE_BOOT_FILESYSTEM]);
@@ -428,22 +392,20 @@ int main(int argc, char *argv[])
                }
        }
 
-       snprintf(commandstring, STRING_SIZE, "/sbin/mkreiserfs -f %s3", hdparams.devnode_part);
+       snprintf(commandstring, STRING_SIZE, "%s %s3", mkfscommand, hdparams.devnode_part);
        if (runcommandwithstatus(commandstring, ctr[TR_MAKING_ROOT_FILESYSTEM]))
        {
                errorbox(ctr[TR_UNABLE_TO_MAKE_ROOT_FILESYSTEM]);
                goto EXIT;
        }
 
-       snprintf(commandstring, STRING_SIZE, "/sbin/mkreiserfs -f %s4", hdparams.devnode_part); 
+       snprintf(commandstring, STRING_SIZE, "%s %s4", mkfscommand, hdparams.devnode_part);     
        if (runcommandwithstatus(commandstring, ctr[TR_MAKING_LOG_FILESYSTEM]))
        {
-               errorbox(ctr[TR_UNABLE_TO_MAKE_ROOT_FILESYSTEM]);
+               errorbox(ctr[TR_UNABLE_TO_MAKE_LOG_FILESYSTEM]);
                goto EXIT;
        }
 
-       /* Mount harddisk. */
-
        snprintf(commandstring, STRING_SIZE, "/bin/mount %s3 /harddisk", hdparams.devnode_part);
        if (runcommandwithstatus(commandstring, ctr[TR_MOUNTING_ROOT_FILESYSTEM]))
        {
@@ -476,15 +438,8 @@ int main(int argc, char *argv[])
                goto EXIT;
        }
 
-       if (installtype == URL_INSTALL) {
-               snprintf(commandstring, STRING_SIZE,
-                       "/bin/wget -q -O - %s/" SNAME "-" VERSION ".tbz2 | /bin/tar -C /harddisk -xvjf -", url);
-       }
-
-       if (installtype == CDROM_INSTALL) {
-               snprintf(commandstring, STRING_SIZE,
-                       "/bin/tar -C /harddisk -xvjf /cdrom/" SNAME "-" VERSION ".tbz2");
-       }
+       snprintf(commandstring, STRING_SIZE,
+               "/bin/tar -C /harddisk -xvjf /cdrom/" SNAME "-" VERSION ".tbz2");
        
        if (runcommandwithprogress(60, 4, title, commandstring, INST_FILECOUNT,
                ctr[TR_INSTALLING_FILES]))
@@ -492,9 +447,6 @@ int main(int argc, char *argv[])
                errorbox(ctr[TR_UNABLE_TO_INSTALL_FILES]);
                goto EXIT;
        }
-               
-       /* Save USB controller type to modules.conf */
-       write_usb_modules_conf();
        
        /* Save language und local settings */
        write_lang_configs(shortlangname);
@@ -504,18 +456,20 @@ int main(int argc, char *argv[])
                "/bin/touch /harddisk/lib/modules/%s-ipfire/modules.dep",
                KERNEL_VERSION);
        mysystem(commandstring);
-       snprintf(commandstring, STRING_SIZE, 
+/*     snprintf(commandstring, STRING_SIZE, 
                "/bin/touch /harddisk/lib/modules/%s-ipfire-smp/modules.dep",
                KERNEL_VERSION);
        mysystem(commandstring);
+*/
 
        /* Rename uname */
        rename ("/harddisk/bin/uname.bak", "/harddisk/bin/uname");
 
        /* mount proc filesystem */
        mysystem("mkdir /harddisk/proc");
-       mysystem("/bin/mount -t proc none /harddisk/proc");
-       mysystem("/bin/mount --bind /dev /harddisk/dev");
+       mysystem("/bin/mount --bind /proc /harddisk/proc");
+       mysystem("/bin/mount --bind /dev  /harddisk/dev");
+       mysystem("/bin/mount --bind /sys  /harddisk/sys");
 
        /* Build cache lang file */
        snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /usr/bin/perl -e \"require '" CONFIG_ROOT "/lang.pl'; &Lang::BuildCacheLang\"");
@@ -527,61 +481,97 @@ int main(int argc, char *argv[])
 
        /* Update /etc/fstab */
        replace("/harddisk/etc/fstab", "DEVICE", hdparams.devnode_part_run);
-
-       /* if we detected SCSI/USB then fixup */
-/*     mysystem("/bin/probecntrl.sh");
-       if ((handle = fopen("/tmp/cntrldriver", "r")))
-       {
-               char *driver;
-               fgets(line, STRING_SIZE-1, handle);
-               fclose(handle);
-               line[strlen(line) - 1] = 0;
-               driver = strtok(line, ".");
-               if (strlen(driver) > 1) {
-                       fprintf(flog, "Fixing up ipfirerd.img\n");
-                       mkdir("/harddisk/initrd", S_IRWXU|S_IRWXG|S_IRWXO);
-                       snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitrd --with=scsi_mod %s --with=sd_mod --with=sr_mod /boot/ipfirerd.img %s-ipfire", driver, KERNEL_VERSION);
-                       runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
-                       snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitrd --with=scsi_mod %s --with=sd_mod --with=sr_mod /boot/ipfirerd-smp.img %s-ipfire-smp", driver, KERNEL_VERSION);
-                       runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
-                       mysystem("/sbin/chroot /harddisk /bin/mv /boot/grub/scsigrub.conf /boot/grub/grub.conf");
+       
+       if (fstype == REISER4) {
+               replace("/harddisk/etc/fstab", "FSTYPE", "reiser4");
+               replace("/harddisk/boot/grub/grub.conf", "MOUNT", "rw");
+       } else if (fstype == REISERFS) {
+               replace("/harddisk/etc/fstab", "FSTYPE", "reiserfs");
+               replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
+       } else if (fstype == EXT3) {
+               snprintf(commandstring, STRING_SIZE, "tune2fs -j %s3", hdparams.devnode_part);
+               if (runcommandwithstatus(commandstring, ctr[TR_JOURNAL_EXT3]))
+               {
+                       errorbox(ctr[TR_JOURNAL_ERROR]);
+                       replace("/harddisk/etc/fstab", "FSTYPE", "ext2");
+                       goto NOJOURNAL;
                }
-       } */
+               snprintf(commandstring, STRING_SIZE, "tune2fs -j %s4", hdparams.devnode_part);
+               if (runcommandwithstatus(commandstring, ctr[TR_JOURNAL_EXT3]))
+               {
+                       errorbox(ctr[TR_JOURNAL_ERROR]);
+                       replace("/harddisk/etc/fstab", "FSTYPE", "ext2");
+                       goto NOJOURNAL;
+               }
+               replace("/harddisk/etc/fstab", "FSTYPE", "ext3");
+               NOJOURNAL:
+               replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
+       }
+
+       replace("/harddisk/boot/grub/grub.conf", "KVER", KERNEL_VERSION);
+
+       /* Build the emergency ramdisk with all drivers */
+       mysystem("cp -f /harddisk/etc/mkinitcpio.conf /harddisk/etc/mkinitcpio.conf.org");
+
+       replace("/harddisk/etc/mkinitcpio.conf", " autodetect ", " ");
+       snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd-%s-emergency.img -k %s-ipfire", KERNEL_VERSION, KERNEL_VERSION);
+       runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
+
+       mysystem("cp -f /harddisk/etc/mkinitcpio.conf.org /harddisk/etc/mkinitcpio.conf");
+
+       /* mkinitcpio has a problem if ide and pata are included */
+       if ( scsi_disk==1 ) {
+           /* Remove the ide hook if we install sda */
+           replace("/harddisk/etc/mkinitcpio.conf", " ide ", " ");
+       } else {
+           /* Remove the pata & sata hook if we install hda */
+           replace("/harddisk/etc/mkinitcpio.conf", " pata ", " ");
+           replace("/harddisk/etc/mkinitcpio.conf", " sata ", " ");
+       }
+       /* Going to make our initrd... */
+       snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd-%s.img -k %s-ipfire", KERNEL_VERSION, KERNEL_VERSION);
+       runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
+/*     snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd-%s-smp.img -k %s-ipfire-smp", KERNEL_VERSION, KERNEL_VERSION );
+       runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
+*/
+
 
        sprintf(string, "root=%s3", hdparams.devnode_part_run);
        replace( "/harddisk/boot/grub/grub.conf", "root=ROOT", string);
-       replace( "/harddisk/boot/grub/grubbatch", "DEVICE", hdparams.devnode_disk);
+       mysystem("ln -s grub.conf /harddisk/boot/grub/menu.lst");
 
-       /* restore permissions */
-       chmod("/harddisk/boot/grub/grubbatch", S_IXUSR | S_IRUSR | S_IXGRP | S_IRGRP | S_IXOTH | S_IROTH);
+       system("sed -e 's#harddisk\\/##g' < /proc/mounts > /harddisk/etc/mtab");
 
        snprintf(commandstring, STRING_SIZE, 
-                "/sbin/chroot /harddisk /boot/grub/grubbatch");
+                "/sbin/chroot /harddisk /usr/sbin/grub-install --no-floppy %s", hdparams.devnode_disk);
        if (runcommandwithstatus(commandstring, ctr[TR_INSTALLING_GRUB])) {
                errorbox(ctr[TR_UNABLE_TO_INSTALL_GRUB]);
                goto EXIT;
        }
-
-       /* Install bootsplash */
-       mysystem("/bin/installbootsplash.sh");
-
-       mysystem("ln -s grub.conf /harddisk/boot/grub/menu.lst");
-//     mysystem("umount /harddisk/proc");
-//     mysystem("umount /harddisk/dev");
+       
+       /* Copy restore file from cdrom */
+       if (unattended && (strlen(restore_file) > 0)) {
+               fprintf(flog, "unattended: Copy restore file\n");
+               snprintf(commandstring, STRING_SIZE, 
+                       "cp /cdrom/%s /harddisk/var/ipfire/backup", restore_file);
+               mysystem(commandstring);
+       }
+       
+       mysystem("umount /cdrom");
+       snprintf(commandstring, STRING_SIZE, "eject /dev/%s", sourcedrive);
+       mysystem(commandstring);
 
        if (!unattended) {
                sprintf(message, ctr[TR_CONGRATULATIONS_LONG],
                                NAME, SNAME, NAME);
                newtWinMessage(ctr[TR_CONGRATULATIONS], ctr[TR_OK], message);
        }
-                
+
        allok = 1;
 
 EXIT:
        fprintf(flog, "Install program ended.\n");      
 
-
-
        if (!(allok))
                newtWinMessage(title, ctr[TR_OK], ctr[TR_PRESS_OK_TO_REBOOT]);  
        
@@ -589,39 +579,28 @@ EXIT:
 
        if (allok && !allok_fastexit)
        {
-               /* /proc is needed by the module checker.  We have to mount it
-                * so it can be seen by setup, which is run chrooted. */
-//             if (system("/bin/mount proc -t proc /harddisk/proc"))
-//                     printf("Unable to mount proc in /harddisk.");
-//             else
-//             {
-                       if (unattended) {
-                           fprintf(flog, "Entering unattended setup\n");
-                           if (unattended_setup(unattendedkv)) {
+               if (unattended) {
+                       fprintf(flog, "Entering unattended setup\n");
+                       if (unattended_setup(unattendedkv)) {
                                snprintf(commandstring, STRING_SIZE, "/bin/sleep 10");
                                runcommandwithstatus(commandstring, "Unattended installation finished, system will reboot");
-                           } else {
+                       } else {
                                errorbox("Unattended setup failed.");
                                goto EXIT;
-                           }
                        }
+               }
 
-                       fflush(flog);
-                       fclose(flog);
-                       newtFinished();
-
-                       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");
-                       }
+               fflush(flog);
+               fclose(flog);
+               newtFinished();
+
+               if (!unattended) {
+                       if (system("/sbin/chroot /harddisk /usr/local/sbin/setup /dev/tty2 INSTALL"))
+                               printf("Unable to run setup.\n");
+               }
 
-                       if (system("/bin/umount /harddisk/proc"))
-                               printf("Unable to umount /harddisk/proc.\n"); 
-//             }
+               if (system("/bin/umount /harddisk/proc"))
+                       printf("Unable to umount /harddisk/proc.\n"); 
        } else {
                fflush(flog);
                fclose(flog);
@@ -638,6 +617,7 @@ EXIT:
 
        system("/bin/umount /harddisk/proc");
        system("/bin/umount /harddisk/dev");
+       system("/bin/umount /harddisk/sys");
 
        system("/bin/umount /harddisk/var");
        system("/bin/umount /harddisk/boot");