Imported french install lang from "IfXen" and add it to build.

[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 52b0402984050b6414acb459e3f4b550c95ec6b1..fc339591ba923e10f5f37623483c63dafa347beb 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -30,12 +30,13 @@ struct knic knics[20] = { { "" , "" , "" , "" } }; // only defined for compile
 
 extern char *en_tr[];
 extern char *de_tr[];
+extern char *fr_tr[];
 
 int main(int argc, char *argv[])
 {
-       char *langnames[] = { "Deutsch", "English", NULL };
-       char *shortlangnames[] = { "de", "en", NULL };
-       char **langtrs[] = { de_tr, en_tr, NULL };
+       char *langnames[] = { "Deutsch", "English", "Francais", NULL };
+       char *shortlangnames[] = { "de", "en", "fr" ,NULL };
+       char **langtrs[] = { de_tr, en_tr, fr_tr,NULL };
        char hdletter;
        char harddrive[30], sourcedrive[5];     /* Device holder. */
        struct devparams hdparams, cdromparams; /* Params for CDROM and HD */
@@ -66,7 +67,7 @@ int main(int argc, char *argv[])
        int unattended = 0;
        struct keyvalue *unattendedkv = initkeyvalues();
        int hardyn = 0;
-       char restore_file[STRING_SIZE];
+       char restore_file[STRING_SIZE] = "";
 
        setlocale (LC_ALL, "");
        sethostname( SNAME , 10);
@@ -90,7 +91,9 @@ int main(int argc, char *argv[])
        newtInit();
        newtCls();
 
-       /* Do usb detection first for usb keyboard */
+       newtDrawRootText(14, 0, NAME " " VERSION " - " SLOGAN );
+       sprintf (title, "%s %s - %s", NAME, VERSION, SLOGAN);
+
        if (! (cmdfile = fopen("/proc/cmdline", "r")))
        {
                fprintf(flog, "Couldn't open commandline: /proc/cmdline\n");
@@ -104,8 +107,14 @@ int main(int argc, char *argv[])
                }               
        }
 
+       // Load ata-piix prior kudzu because kudzu use ata-generic for ich7
+       mysystem("/sbin/modprobe ata_piix");
+
+       // Starting hardware detection
+       runcommandwithstatus("/bin/probehw.sh", "Probing Hardware ...");
+
+       // Load common modules
        mysystem("/sbin/modprobe ide-generic");
-       mysystem("/sbin/modprobe generic");
        mysystem("/sbin/modprobe ide-cd");
        mysystem("/sbin/modprobe ide-disk");
        mysystem("/sbin/modprobe uhci-hcd");
@@ -120,6 +129,8 @@ int main(int argc, char *argv[])
        mysystem("/sbin/modprobe iso9660"); // CDROM
        mysystem("/sbin/modprobe ext2"); // Boot patition
        mysystem("/sbin/modprobe vfat"); // USB key
+
+       runcommandwithstatus("/bin/sleep 10", "Waiting for USB Hardware ...");
        
        /* German is the default */
        for (choice = 0; langnames[choice]; choice++)
@@ -138,12 +149,7 @@ int main(int argc, char *argv[])
        ctr = langtrs[choice];
        strcpy(shortlangname, shortlangnames[choice]);
 
-       newtDrawRootText(14, 0, NAME " " VERSION " - " SLOGAN );
        newtPushHelpLine(ctr[TR_HELPLINE]);
-       sprintf (title, "%s %s - %s", NAME, VERSION, SLOGAN);
-
-       // Starting hardware detection
-       runcommandwithstatus("/bin/probehw.sh", ctr[TR_PROBING_HARDWARE]);
 
        sprintf(message, ctr[TR_WELCOME], NAME);
        newtWinMessage(title, ctr[TR_OK], message);
@@ -455,6 +461,7 @@ int main(int argc, char *argv[])
                KERNEL_VERSION);
        mysystem(commandstring);
 */
+
        /* Rename uname */
        rename ("/harddisk/bin/uname.bak", "/harddisk/bin/uname");
 
@@ -527,6 +534,8 @@ int main(int argc, char *argv[])
 /*     snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -g /boot/ipfirerd-%s-smp.img -k %s-ipfire-smp", KERNEL_VERSION, KERNEL_VERSION );
        runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
 */
+
+
        sprintf(string, "root=%s3", hdparams.devnode_part_run);
        replace( "/harddisk/boot/grub/grub.conf", "root=ROOT", string);
        mysystem("ln -s grub.conf /harddisk/boot/grub/menu.lst");
@@ -543,8 +552,9 @@ int main(int argc, char *argv[])
        /* Copy restore file from cdrom */
        if (unattended && (strlen(restore_file) > 0)) {
                fprintf(flog, "unattended: Copy restore file\n");
-           snprintf(commandstring, STRING_SIZE, 
+               snprintf(commandstring, STRING_SIZE, 
                        "cp /cdrom/%s /harddisk/var/ipfire/backup", restore_file);
+               mysystem(commandstring);
        }
        
        mysystem("umount /cdrom");