Merge branch 'master' into next

[people/pmueller/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 ca2d5bd619b2b7d68da0ea2b7b17d27957992186..60b8cba502af58dd15bfcf5141ef126bdf61986c 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -11,7 +11,7 @@
 #include "install.h"
 #define _GNU_SOURCE
  
-#define INST_FILECOUNT 8400
+#define INST_FILECOUNT 10700
 #define UNATTENDED_CONF "/cdrom/boot/unattended.conf"
 
 #define EXT2 0
@@ -33,15 +33,16 @@ extern char *en_tr[];
 extern char *es_tr[];
 extern char *de_tr[];
 extern char *fr_tr[];
+extern char *pl_tr[];
 
 int main(int argc, char *argv[])
 {
 
        char discl_msg[40000] = "Disclaimer\n";
 
-       char *langnames[] = { "Deutsch", "English", "Français", "Español", NULL };
-       char *shortlangnames[] = { "de", "en", "fr", "es", NULL };
-       char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, NULL };
+       char *langnames[] = { "Deutsch", "English", "Français", "Español", "Polski", NULL };
+       char *shortlangnames[] = { "de", "en", "fr", "es", "pl", NULL };
+       char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, pl_tr, NULL };
        char hdletter;
        char harddrive[30], sourcedrive[5];     /* Device holder. */
        struct devparams hdparams, cdromparams; /* Params for CDROM and HD */
@@ -49,7 +50,7 @@ int main(int argc, char *argv[])
        char commandstring[STRING_SIZE];
        char mkfscommand[STRING_SIZE];
        char *fstypes[] = { "ext2", "ext3", "ext4", "ReiserFS", NULL };
-       int fstype = EXT3;
+       int fstype = EXT4;
        int choice;
        int i;
        int found = 0;
@@ -70,6 +71,7 @@ int main(int argc, char *argv[])
        char *yesnoharddisk[3]; //      char *yesnoharddisk = { "NO", "YES", NULL };
                
        int unattended = 0;
+       int serialconsole = 0;
        struct keyvalue *unattendedkv = initkeyvalues();
        int hardyn = 0;
        char restore_file[STRING_SIZE] = "";
@@ -110,6 +112,10 @@ int main(int argc, char *argv[])
                    unattended = 1;
                    runcommandwithstatus("/bin/sleep 10", "WARNING: Unattended installation will start in 10 seconds...");
                }               
+               // check if we have to patch for serial console
+               if (strstr (line, "console=ttyS0") != NULL) {
+                   serialconsole = 1;
+               }
        }
 
        // Read gpl ...
@@ -130,7 +136,7 @@ int main(int argc, char *argv[])
        /* German is the default */
        for (choice = 0; langnames[choice]; choice++)
        {
-               if (strcmp(langnames[choice], "Deutsch") == 0)
+               if (strcmp(langnames[choice], "English") == 0)
                        break;
        }
        if (!langnames[choice])
@@ -146,10 +152,10 @@ int main(int argc, char *argv[])
 
        newtPushHelpLine(ctr[TR_HELPLINE]);
 
-       sprintf(message, ctr[TR_WELCOME], NAME);
-       newtWinMessage(title, ctr[TR_OK], message);
-
        if (!unattended) {
+               sprintf(message, ctr[TR_WELCOME], NAME);
+               newtWinMessage(title, ctr[TR_OK], message);
+
                if (disclaimerbox(discl_msg)==0) {
                        errorbox(ctr[TR_LICENSE_NOT_ACCEPTED]);
                        goto EXIT;
@@ -511,7 +517,28 @@ int main(int argc, char *argv[])
                errorbox(ctr[TR_UNABLE_TO_INSTALL_GRUB]);
                goto EXIT;
        }
-       
+
+       /* Serial console ? */
+       if (serialconsole) {
+               /* grub */
+               replace("/harddisk/boot/grub/grub.conf", "splashimage", "#splashimage");
+               replace("/harddisk/boot/grub/grub.conf", "#serial", "serial");
+               replace("/harddisk/boot/grub/grub.conf", "#terminal", "terminal");
+               replace("/harddisk/boot/grub/grub.conf", " panic=10 ", " console=ttyS0,38400n8 panic=10 ");
+
+               /*inittab*/
+               replace("/harddisk/etc/inittab", "1:2345:respawn:", "#1:2345:respawn:");
+               replace("/harddisk/etc/inittab", "2:2345:respawn:", "#2:2345:respawn:");
+               replace("/harddisk/etc/inittab", "3:2345:respawn:", "#3:2345:respawn:");
+               replace("/harddisk/etc/inittab", "4:2345:respawn:", "#4:2345:respawn:");
+               replace("/harddisk/etc/inittab", "5:2345:respawn:", "#5:2345:respawn:");
+               replace("/harddisk/etc/inittab", "6:2345:respawn:", "#6:2345:respawn:");
+               replace("/harddisk/etc/inittab", "#7:2345:respawn:", "7:2345:respawn:");
+       }
+
+       /* Set marker that the user has already accepted the gpl */
+       mysystem("/usr/bin/touch /harddisk/var/ipfire/main/gpl_accepted");
+
        /* Copy restore file from cdrom */
        if (unattended && (strlen(restore_file) > 0)) {
                fprintf(flog, "unattended: Copy restore file\n");
@@ -527,7 +554,7 @@ int main(int argc, char *argv[])
        if (!unattended) {
                sprintf(message, ctr[TR_CONGRATULATIONS_LONG],
                                NAME, SNAME, NAME);
-               newtWinMessage(ctr[TR_CONGRATULATIONS], ctr[TR_OK], message);
+               newtWinMessage(ctr[TR_CONGRATULATIONS], ctr[TR_PRESS_OK_TO_REBOOT], message);
        }
 
        allok = 1;
@@ -579,13 +606,13 @@ EXIT:
 
        newtFinished();
 
-       system("/bin/umount /harddisk/proc");
-       system("/bin/umount /harddisk/dev");
-       system("/bin/umount /harddisk/sys");
+       system("/bin/umount /harddisk/proc >/dev/null 2>&1");
+       system("/bin/umount /harddisk/dev >/dev/null 2>&1");
+       system("/bin/umount /harddisk/sys >/dev/null 2>&1");
 
-       system("/bin/umount /harddisk/var");
-       system("/bin/umount /harddisk/boot");
-       system("/bin/umount /harddisk");
+       system("/bin/umount /harddisk/var >/dev/null 2>&1");
+       system("/bin/umount /harddisk/boot >/dev/null 2>&1");
+       system("/bin/umount /harddisk >/dev/null 2>&1");
 
        if (!(allok))
                system("/etc/halt");