Geändert:

[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 990f942f624ad172a3f57e5257c92bf86e010f35..fab8de3d56c929731b636861281db5caeb5de29a 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -193,14 +193,17 @@ int main(int argc, char *argv[])
        sprintf (title, "%s v%s - %s", NAME, VERSION, SLOGAN);
        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);
-       
-       if (rc == 2)
-               goto EXIT;
-                                               
+       /* 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); 
+        *
+        *      if (rc == 2)
+        *      goto EXIT;
+        * This is for avoiding the question for a network installation. Set to cdrom.
+        */
+       sprintf(installtype, CDROM_INSTALL, NAME);
+                                       
        if (installtype == CDROM_INSTALL)
        {       
                /* First look for an IDE CDROM. */
@@ -378,7 +381,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]);
@@ -690,13 +693,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();
 
@@ -954,14 +964,11 @@ RESTORE:
        }
        /* Set Bootsplash */
        if ((handle = fopen("/scsidriver", "r")))
-       {
                mysystem("/bin/chroot /harddisk /sbin/splash -s -f /boot/splash/config/bootsplash-1024x768.cgf >> /harddisk/boot/ipfirerd.img");
-               mysystem("/bin/chroot /harddisk /sbin/splash -s -f /boot/splash/config/bootsplash-1024x768.cgf >> /harddisk/boot/ipfirerd-smp.img");
-       }
        else
-       {
                mysystem("/bin/chroot /harddisk /sbin/splash -s -f /boot/splash/config/bootsplash-1024x768.cgf > /harddisk/boot/initrd.splash");
-       }
+       if ((handle = fopen("/scsidriver", "r")))
+               mysystem("/bin/chroot /harddisk /sbin/splash -s -f /boot/splash/config/bootsplash-1024x768.cgf >> /harddisk/boot/ipfirerd-smp.img");
        mysystem("/bin/chroot /harddisk /bin/umount -n /proc");
 #endif
 #ifdef __alpha__