Sprachen in den Installer auf DE und EN begrenzt.

Deutsch als default.
Abfrage für "alte Konfiguration laden" entfernt.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@170 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index df8bb0129c46bb9d99a1bd1fffa5c08b127ffa40..fb0b66e6a4b1dbf30dbf45a35e8283614a43dde6 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -52,7 +52,7 @@ int main(int argc, char *argv[])
         char *langnames[] = { "English", NULL };
         char *shortlangnames[] = { "en", NULL };
         char **langtrs[] = { en_tr, NULL };
-#elif  LANG_DE_EN
+#elifdef       LANG_DE_EN
        char *langnames[] = { "Deutsch", "English", NULL };
        char *shortlangnames[] = { "de", "en", NULL };
        char **langtrs[] = { de_tr, en_tr, NULL };
@@ -753,6 +753,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;
@@ -847,6 +848,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 */
        {