X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=src%2Finstall%2Bsetup%2Finstall%2Fmain.c;h=fc339591ba923e10f5f37623483c63dafa347beb;hp=9f0d0b08b87eff8c6a0e6d0f5eeb057a1be45260;hb=462515e4c105654667e80ea423787395408e36a7;hpb=ce9fac5bfd040f87bb5002eabe3a7fc365aff9a6

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 9f0d0b08b8..fc339591ba 100644
--- 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 */
@@ -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);