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=20b868fa344afc070ef4a50183d3632f04a166b3;hp=ffe833abbb528b293f63472b79063ec7acf05107;hb=493e5e62d73a88e8375d19cfdb04239d3eeb12b9;hpb=6abfa9889f7acf651e091897ea5e4db83c055a2b

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index ffe833abbb..20b868fa34 100644
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -66,6 +66,7 @@ int main(int argc, char *argv[])
 	int unattended = 0;
 	struct keyvalue *unattendedkv = initkeyvalues();
 	int hardyn = 0;
+	char restore_file[STRING_SIZE] = "";
 
 	setlocale (LC_ALL, "");
 	sethostname( SNAME , 10);
@@ -89,7 +90,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");
@@ -103,9 +106,15 @@ 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_mod");
+	mysystem("/sbin/modprobe ide-cd");
 	mysystem("/sbin/modprobe ide-disk");
 	mysystem("/sbin/modprobe uhci-hcd");
 	mysystem("/sbin/modprobe ohci-hcd");
@@ -119,6 +128,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++)
@@ -137,12 +148,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);
@@ -208,6 +214,7 @@ int main(int argc, char *argv[])
 	    fprintf(flog, "unattended: Reading unattended.conf\n");
 
 	    (void) readkeyvalues(unattendedkv, UNATTENDED_CONF);
+	    findkey(unattendedkv, "RESTORE_FILE", restore_file);	    
 	}
 	
 	/* Make the hdparms struct and print the contents.
@@ -453,6 +460,7 @@ int main(int argc, char *argv[])
 		KERNEL_VERSION);
 	mysystem(commandstring);
 */
+
 	/* Rename uname */
 	rename ("/harddisk/bin/uname.bak", "/harddisk/bin/uname");
 
@@ -525,6 +533,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");
@@ -538,6 +548,14 @@ int main(int argc, char *argv[])
 		goto EXIT;
 	}
 	
+	/* Copy restore file from cdrom */
+	if (unattended && (strlen(restore_file) > 0)) {
+		fprintf(flog, "unattended: Copy restore file\n");
+		snprintf(commandstring, STRING_SIZE, 
+			"cp /cdrom/%s /harddisk/var/ipfire/backup", restore_file);
+		mysystem(commandstring);
+	}
+	
 	mysystem("umount /cdrom");
 	snprintf(commandstring, STRING_SIZE, "eject /dev/%s", sourcedrive);
 	mysystem(commandstring);