Hinzugefuegt:

[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 9770358d73def7ab7d94ddd89d59c3f916331055..2ca2f07da0d823112b3772fda1262dc65b0cfc7e 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -51,10 +51,14 @@ int main(int argc, char *argv[])
         char *langnames[] = { "English", NULL };
         char *shortlangnames[] = { "en", NULL };
         char **langtrs[] = { en_tr, NULL };
-#else
+#elifdef       LANG_ALL
        char *langnames[] = { "Brasil", "Cestina", "Dansk", "Deutsch", "English", "Español", "Français", "Hellenic", "Italiano", "Spanish Latino", "Magyar", "Nederlands", "Norsk", "Polski", "Português", "Soomali", "Suomi", "Svenska", "Türkçe", "Tieng Viet", NULL };
        char *shortlangnames[] = { "bz", "cs", "da", "de", "en", "es", "fr", "el", "it", "la", "hu", "nl", "no", "pl", "pt", "so", "fi", "sv", "tr", "vi", NULL };
-       char **langtrs[] = { bz_tr, cs_tr, da_tr, de_tr, en_tr, es_tr, fr_tr, el_tr, it_tr, la_tr, hu_tr, nl_tr, no_tr, pl_tr, pt_tr, so_tr, fi_tr, sv_tr, tr_tr, vi_tr, NULL };
+       char **langtrs[] = { bz_tr, cs_tr, da_tr, de_tr, en_tr, es_tr, fr_tr, el_tr, it_tr, la_tr, hu_tr, nl_tr, no_tr, pl_tr, pt_tr, so_tr, fi_tr, sv_tr, tr_tr, vi_tr, NULL };        
+#else
+       char *langnames[] = { "Deutsch", "English", NULL };
+       char *shortlangnames[] = { "de", "en", NULL };
+       char **langtrs[] = { de_tr, en_tr, NULL };
 #endif
        char hdletter, cdletter;
        char harddrive[5], cdromdrive[5];       /* Device holder. */
@@ -145,10 +149,10 @@ int main(int argc, char *argv[])
                }
        }
        
-       /* English is the default */
+       /* Deutsch is the default */
        for (choice = 0; langnames[choice]; choice++)
        {
-               if (strcmp(langnames[choice], "English") == 0)
+               if (strcmp(langnames[choice], "Deutsch") == 0)
                        break;
        }
        if (!langnames[choice])
@@ -193,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. */
@@ -374,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]);
@@ -686,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();
 
@@ -747,6 +758,7 @@ int main(int argc, char *argv[])
          error and go back to the restore/skip question. This gives
          the user the chance to have another go. */
 
+#ifdef OLD_RESTORECFG  
 RESTORE:
        /* set status variables to nonsense values */
        allok_fastexit = 0;
@@ -841,6 +853,19 @@ RESTORE:
                      set up and user is notrestarting from floppy*/
          }
        }
+#else  
+       if (installtype == CDROM_INSTALL){
+        /* if we installed from CD ROM then we didn't set up the
+           network interface yet.  Therefore, set up Network
+           driver and params just before we need them. */
+
+       if (!(networkmenu(ethernetkv))){
+       /* network setup failed, tell the world */
+         errorbox(ctr[TR_NETWORK_SETUP_FAILED]);
+         goto EXIT;
+         }
+       }
+#endif
        
        /* Check the SQUID acl file exists, if not use our 1.4 copy */
        {
@@ -879,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
@@ -900,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");
@@ -934,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__