X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Finstall%2Bsetup%2Finstall%2Fmain.c;h=a46de921f70bebbe9aafd46712c3c97f5a42d578;hb=b6af41a572eb83e73875b1f8d450405fbee8eb0a;hp=ff0b3a27f39e006d41268222b6c7b1632d51ce85;hpb=6cf9e77034bd4b27932e806a70e9b6985216a913;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index ff0b3a27f..a46de921f 100644
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -108,31 +108,10 @@ 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 ide-cd");
-//	mysystem("/sbin/modprobe ide-disk");
-//	mysystem("/sbin/modprobe ehci-hcd");
-//	mysystem("/sbin/modprobe uhci-hcd");
-//	mysystem("/sbin/modprobe ohci-hcd");
-//	mysystem("/sbin/modprobe ohci1394");
-//	mysystem("/sbin/modprobe sd_mod");
-//	mysystem("/sbin/modprobe sr_mod");
-//	mysystem("/sbin/modprobe usb-storage");
-//	mysystem("/sbin/modprobe usbhid");
-//	mysystem("/sbin/modprobe ahci");
-
 	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++)
@@ -231,11 +210,6 @@ int main(int argc, char *argv[])
 	sprintf(hdparams.devnode_part, "/dev/%s%s", harddrive,raid_disk ? "p" : "");
 	/* Now the names after the machine is booted. Only scsi is affected
 	   and we only install on the first scsi disk. */
-	{	char tmp[30];
-		strcpy(tmp, scsi_disk ? "sda" : harddrive);
-		sprintf(hdparams.devnode_disk_run, "/dev/%s", tmp);
-		sprintf(hdparams.devnode_part_run, "/dev/%s%s", tmp, raid_disk ? "p" : "");
-	}
 
 	fprintf(flog, "Destination drive: %s\n", hdparams.devnode_disk);
 	
@@ -441,7 +415,7 @@ int main(int argc, char *argv[])
 	}
 
 	snprintf(commandstring, STRING_SIZE,
-		"/bin/tar -C /harddisk  -xvf /cdrom/" SNAME "-" VERSION ".tlz --lzma");
+		"/bin/tar -C /harddisk  -xvf /cdrom/" SNAME "-" VERSION ".tlz --lzma 2>/dev/null");
 	
 	if (runcommandwithprogress(60, 4, title, commandstring, INST_FILECOUNT,
 		ctr[TR_INSTALLING_FILES]))
@@ -453,17 +427,6 @@ int main(int argc, char *argv[])
 	/* Save language und local settings */
 	write_lang_configs(shortlangname);
 
-//	/* touch the modules.dep files */
-//	snprintf(commandstring, STRING_SIZE, 
-//		"/bin/touch /harddisk/lib/modules/%s-ipfire/modules.dep",
-//		KERNEL_VERSION);
-//	mysystem(commandstring);
-/*	snprintf(commandstring, STRING_SIZE, 
-		"/bin/touch /harddisk/lib/modules/%s-ipfire-smp/modules.dep",
-		KERNEL_VERSION);
-	mysystem(commandstring);
-*/
-
 	/* Rename uname */
 	rename ("/harddisk/bin/uname.bak", "/harddisk/bin/uname");
 
@@ -482,8 +445,15 @@ int main(int argc, char *argv[])
 	}
 
 	/* Update /etc/fstab */
-	replace("/harddisk/etc/fstab", "DEVICE", hdparams.devnode_part_run);
-	
+	snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#DEVICE1#UUID=$(/sbin/blkid %s1 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/etc/fstab", hdparams.devnode_part);
+	system(commandstring);
+	snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#DEVICE2#UUID=$(/sbin/blkid %s2 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/etc/fstab", hdparams.devnode_part);
+	system(commandstring);
+	snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#DEVICE3#UUID=$(/sbin/blkid %s3 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/etc/fstab", hdparams.devnode_part);
+	system(commandstring);
+	snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#DEVICE4#UUID=$(/sbin/blkid %s4 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/etc/fstab", hdparams.devnode_part);
+	system(commandstring);
+
 	if (fstype == EXT2) {
 		replace("/harddisk/etc/fstab", "FSTYPE", "ext2");
 		replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
@@ -491,20 +461,6 @@ int main(int argc, char *argv[])
 		replace("/harddisk/etc/fstab", "FSTYPE", "reiserfs");
 		replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
 	} else if (fstype == EXT3) {
-		//snprintf(commandstring, STRING_SIZE, "tune2fs -j %s3", hdparams.devnode_part);
-		//if (runcommandwithstatus(commandstring, ctr[TR_JOURNAL_EXT3]))
-		//{
-		//	errorbox(ctr[TR_JOURNAL_ERROR]);
-		//	replace("/harddisk/etc/fstab", "FSTYPE", "ext2");
-		//	goto NOJOURNAL;
-		//}
-		//snprintf(commandstring, STRING_SIZE, "tune2fs -j %s4", hdparams.devnode_part);
-		//if (runcommandwithstatus(commandstring, ctr[TR_JOURNAL_EXT3]))
-		//{
-		//	errorbox(ctr[TR_JOURNAL_ERROR]);
-		//	replace("/harddisk/etc/fstab", "FSTYPE", "ext2");
-		//	goto NOJOURNAL;
-		//}
 		replace("/harddisk/etc/fstab", "FSTYPE", "ext3");
 		NOJOURNAL:
 		replace("/harddisk/boot/grub/grub.conf", "MOUNT", "ro");
@@ -512,15 +468,12 @@ int main(int argc, char *argv[])
 
 	replace("/harddisk/boot/grub/grub.conf", "KVER", KERNEL_VERSION);
 
-	/* Going to make our initrd... */
-/*	snprintf(commandstring, STRING_SIZE, "/usr/sbin/chroot /harddisk /usr/local/bin/rebuild-initrd");
-	runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
-*/
-	sprintf(string, "root=%s3", hdparams.devnode_part_run);
-	replace( "/harddisk/boot/grub/grub.conf", "root=ROOT", string);
+	snprintf(commandstring, STRING_SIZE, "/bin/sed -i -e \"s#root=ROOT#root=UUID=$(/sbin/blkid %s3 -sUUID | /usr/bin/cut -d'\"' -f2)#g\" /harddisk/boot/grub/grub.conf", hdparams.devnode_part);
+	system(commandstring);
+
 	mysystem("ln -s grub.conf /harddisk/boot/grub/menu.lst");
 
-	system("sed -e 's#/harddisk#/#g' -e 's#//#/#g'  < /proc/mounts > /harddisk/etc/mtab");
+	system("/bin/sed -e 's#/harddisk#/#g' -e 's#//#/#g'  < /proc/mounts > /harddisk/etc/mtab");
 
 	snprintf(commandstring, STRING_SIZE, 
 		 "/usr/sbin/chroot /harddisk /usr/sbin/grub-install --no-floppy %s", hdparams.devnode_disk);
@@ -538,7 +491,7 @@ int main(int argc, char *argv[])
 	}
 	
 	mysystem("umount /cdrom");
-	snprintf(commandstring, STRING_SIZE, "eject /dev/%s", sourcedrive);
+	snprintf(commandstring, STRING_SIZE, "/usr/bin/eject /dev/%s", sourcedrive);
 	mysystem(commandstring);
 
 	if (!unattended) {