uClibc-Update.

[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 565ad1f047ed44064d033218a99e0c95dfff9432..dcf47926c25c569445332ce100713d416e398ee3 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -197,10 +197,10 @@ int main(int argc, char *argv[])
        rc = newtWinMenu(ctr[TR_SELECT_INSTALLATION_MEDIA], message,
                50, 5, 5, 6, installtypes, &installtype, ctr[TR_OK],
                ctr[TR_CANCEL], NULL);
-       
+
        if (rc == 2)
                goto EXIT;
-                                               
+                                       
        if (installtype == CDROM_INSTALL)
        {       
                /* First look for an IDE CDROM. */
@@ -378,7 +378,7 @@ int main(int argc, char *argv[])
                        goto EXIT;
                }
 
-               /* Check for ipcop-<VERSION>.tgz */
+               /* Check for ipfire-<VERSION>.tgz */
                if (!(checktarball(SNAME "-" VERSION ".tgz")))
                {
                        errorbox(ctr[TR_NO_IPCOP_TARBALL_FOUND]);
@@ -553,7 +553,7 @@ int main(int argc, char *argv[])
                swap_file = 0;
        }
 
-       boot_partition = 8; /* in MB */
+       boot_partition = 20; /* in MB */
        current_free = maximum_free - boot_partition - swap_file;
 
        /* Give more place for add-on, extend root to 25% of current_free, upper limit to 8 gigas */
@@ -690,13 +690,20 @@ int main(int argc, char *argv[])
                snprintf(commandstring, STRING_SIZE, 
                        "/bin/wget -O - %s/" SNAME "-" VERSION ".tgz | /bin/tar -C /harddisk -xvzf -", url);
        
-       if (runcommandwithprogress(60, 4, title, commandstring, 4600,
-               ctr[TR_INSTALLING_FILES]))
+       /* if (runcommandwithprogress(60, 4, title, commandstring, 4600,
+        *      ctr[TR_INSTALLING_FILES]))
+        * {
+        *      errorbox(ctr[TR_UNABLE_TO_INSTALL_FILES]);
+        *      goto EXIT;
+        * }
+        */
+
+       if (runcommandwithstatus(commandstring, ctr[TR_INSTALLING_FILES]))
        {
                errorbox(ctr[TR_UNABLE_TO_INSTALL_FILES]);
                goto EXIT;
        }
-       
+               
        /* Save USB controller type to modules.conf */
        write_usb_modules_conf();
 
@@ -897,13 +904,13 @@ RESTORE:
                driver = strtok(line, ".");
                fprintf(flog, "Detected SCSI driver %s\n",driver);
                if (strlen(driver) > 1) {
-                       fprintf(flog, "Fixing up ipcoprd.img\n");
+                       fprintf(flog, "Fixing up ipfirerd.img\n");
                        mysystem("/bin/chroot /harddisk /sbin/modprobe loop");
                        mkdir("/harddisk/initrd", S_IRWXU|S_IRWXG|S_IRWXO);
-                       snprintf(commandstring, STRING_SIZE, "/bin/chroot /harddisk /sbin/mkinitrd --with=scsi_mod --with=%s --with=sd_mod --with=sr_mod --with=libata --with=ataraid /boot/ipcoprd.img %s", driver, KERNEL_VERSION);
+                       snprintf(commandstring, STRING_SIZE, "/bin/chroot /harddisk /sbin/mkinitrd --with=scsi_mod --with=%s --with=sd_mod --with=sr_mod --with=libata --with=ataraid /boot/ipfirerd.img %s", driver, KERNEL_VERSION);
                        runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
 #ifdef __i386__
-                       snprintf(commandstring, STRING_SIZE, "/bin/chroot /harddisk /sbin/mkinitrd --with=scsi_mod --with=%s --with=sd_mod --with=sr_mod --with=libata --with=ataraid /boot/ipcoprd-smp.img %s-smp", driver, KERNEL_VERSION);
+                       snprintf(commandstring, STRING_SIZE, "/bin/chroot /harddisk /sbin/mkinitrd --with=scsi_mod --with=%s --with=sd_mod --with=sr_mod --with=libata --with=ataraid /boot/ipfirerd-smp.img %s-smp", driver, KERNEL_VERSION);
                        runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
                        mysystem("/bin/chroot /harddisk /bin/mv /boot/grub/scsigrub.conf /boot/grub/grub.conf");
 #endif
@@ -918,10 +925,10 @@ RESTORE:
        if (pcmcia_disk)
        {
                fprintf(flog, "Detected SCSI driver PCMCIA\n");
-               fprintf(flog, "Fixing up ipcoprd.img\n");
+               fprintf(flog, "Fixing up ipfirerd.img\n");
                mysystem("/bin/chroot /harddisk /sbin/modprobe loop");
                mkdir("/harddisk/initrd", S_IRWXU|S_IRWXG|S_IRWXO);
-               snprintf(commandstring, STRING_SIZE, "/bin/chroot /harddisk /sbin/pcinitrd -r %s /boot/ipcoprd.img", KERNEL_VERSION);
+               snprintf(commandstring, STRING_SIZE, "/bin/chroot /harddisk /sbin/pcinitrd -r %s /boot/ipfirerd.img", KERNEL_VERSION);
                mysystem(commandstring);
 #ifdef __i386__
                mysystem("/bin/chroot /harddisk /bin/mv /boot/grub/scsigrub.conf /boot/grub/grub.conf");
@@ -952,6 +959,8 @@ RESTORE:
                errorbox(ctr[TR_UNABLE_TO_INSTALL_GRUB]);
                goto EXIT;
        }
+       /* Set Bootsplash */
+       mysystem("/bin/installbootsplash.sh");
        mysystem("/bin/chroot /harddisk /bin/umount -n /proc");
 #endif
 #ifdef __alpha__