From a6753b551efac7b901656da88180102c4a815e9a Mon Sep 17 00:00:00 2001 From: casemaster Date: Sat, 10 Jun 2006 22:38:23 +0000 Subject: [PATCH] =?utf8?q?Sprachen=20in=20den=20Installer=20auf=20DE=20und?= =?utf8?q?=20EN=20begrenzt.=20Deutsch=20als=20default.=20Abfrage=20f=C3=BC?= =?utf8?q?r=20"alte=20Konfiguration=20laden"=20entfernt.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@170 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- src/install+setup/install/main.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index df8bb0129c..fb0b66e6a4 100644 --- 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 */ { -- 2.39.2