Merge branch 'iptables-upnpfw' into core67-merge

[ipfire-2.x.git] / src / install+setup / setup / main.c

diff --git a/src/install+setup/setup/main.c b/src/install+setup/setup/main.c
index 3fc800e134b2ed5153725f1a5faf108815dc6a2b..d078a5258b7bca8f106359ef04bf0270cc7f19ac 100644 (file)
--- a/src/install+setup/setup/main.c
+++ b/src/install+setup/setup/main.c
@@ -22,6 +22,11 @@ struct knic knics[20] = { { "" , "" , "" , "" } };
 
 extern char *en_tr[];
 extern char *de_tr[];
+extern char *fr_tr[];
+extern char *es_tr[];
+extern char *pl_tr[];
+extern char *ru_tr[];
+extern char *nl_tr[];
 
 int main(int argc, char *argv[])
 {
@@ -29,8 +34,8 @@ int main(int argc, char *argv[])
        char *shortlangnames[] = { "en", NULL };
        char **langtrs[] = { en_tr, NULL };
 #else
-       char *shortlangnames[] = { "de", "en", NULL };
-       char **langtrs[] = { de_tr, en_tr, NULL };
+       char *shortlangnames[] = { "de", "en", "fr", "es", "nl", "pl", "ru", NULL };
+       char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, nl_tr, pl_tr, ru_tr, NULL };
 #endif
        int choice;
        char *sections[11]; /* need to fill this out AFTER knowning lang */
@@ -95,9 +100,10 @@ int main(int argc, char *argv[])
        sections[2] = ctr[TR_HOSTNAME];
        sections[3] = ctr[TR_DOMAINNAME];
        sections[4] = ctr[TR_NETWORKING];
-       sections[5] = ctr[TR_ROOT_PASSWORD];
-       sections[6] = ctr[TR_ADMIN_PASSWORD];
-       sections[7] = NULL;
+       sections[5] = ctr[TR_ISDN];
+       sections[6] = ctr[TR_ROOT_PASSWORD];
+       sections[7] = ctr[TR_ADMIN_PASSWORD];
+       sections[8] = NULL;
 
        newtInit();
        newtCls();
@@ -147,12 +153,16 @@ int main(int argc, char *argv[])
                                case 4:
                                        handlenetworking();
                                        break;
-
+                               
                                case 5:
+                                       handleisdn();
+                                       break;
+
+                               case 6:
                                        handlerootpassword();
                                        break;
                                        
-                               case 6:
+                               case 7:
                                        handleadminpassword();
                                        break;
                
@@ -171,14 +181,16 @@ int main(int argc, char *argv[])
                        goto EXIT;
                if (!(handledomainname()))
                        goto EXIT;
-               if (!(handlenetworking()))
-                       goto EXIT;
-               if (!(handledhcp()))
-                       goto EXIT;
                if (!(handlerootpassword()))
                        goto EXIT;
                if (!(handleadminpassword()))
                        goto EXIT;
+               if (!(handleisdn()))
+                       goto EXIT;
+               if (!(handlenetworking()))
+                       goto EXIT;
+               if (!(handledhcp()))
+                       goto EXIT;
 
                autook = 1;
        }
@@ -190,7 +202,17 @@ EXIT:
                if (autook)
                        newtWinMessage(title, ctr[TR_OK], ctr[TR_SETUP_FINISHED]);
                else
+               {
                        newtWinMessage(ctr[TR_WARNING], ctr[TR_OK], ctr[TR_SETUP_NOT_COMPLETE]);
+
+                       fprintf(flog, "Setup program has not finished.\n");
+                       fflush(flog);
+                       fclose(flog);
+
+                       newtFinished();
+
+                       return 1;
+               }
        }
 
        fprintf(flog, "Setup program ended.\n");