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=5586689f2eb3c600cc59ac745b312af9b0eb2e3c;hp=cb04955073650c53462d817d585d2cc5226a3c84;hb=aee3027d875826e18b3eb198f9ad0c3228bfbb01;hpb=59de0b00db1c180965df666517765ced67509787

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index cb04955073..5586689f2e 100644
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -25,6 +25,9 @@ char **ctr;
 
 extern char url[STRING_SIZE];
 
+struct  nic  nics[20] = { { "" , "" } }; // only defined for compile
+struct knic knics[20] = { { "" , "" , "" } }; // only defined for compile
+
 extern char *en_tr[];
 extern char *de_tr[];
 
@@ -70,6 +73,9 @@ int main(int argc, char *argv[])
 	char *installtypes[] = { "CDROM/USB", "HTTP/FTP", NULL };
 	int installtype = CDROM_INSTALL;
 	int choice;
+	int i;
+	int found = 0;
+	int firstrun = 0;
 	char shortlangname[10];
 	char message[1000];
 	char title[STRING_SIZE];
@@ -83,7 +89,8 @@ int main(int argc, char *argv[])
 	long memory = 0;
 	long system_partition, boot_partition, root_partition, swap_file;
 	int scsi_disk = 0;
-	char *yesnoharddisk[] = { "NO", "YES", NULL };
+	char *yesnoharddisk[3];	//	char *yesnoharddisk = { "NO", "YES", NULL };
+		
 	int unattended = 0;
 	struct keyvalue *unattendedkv = initkeyvalues();
 	int hardyn = 0;
@@ -116,6 +123,12 @@ int main(int argc, char *argv[])
 		fprintf(flog, "Couldn't open commandline: /proc/cmdline\n");
 	} else {
 		fgets(line, STRING_SIZE, cmdfile);
+		if (strstr (line, "noide") == NULL) {
+			fprintf(flog, "Initializing IDE controllers.\n");
+			initialize_ide();
+		} else {
+			fprintf(flog, "Skipping IDE detection.\n");
+		}
 		if (strstr (line, "nousb") == NULL) {
 			fprintf(flog, "Initializing USB controllers.\n");
 			initialize_usb();
@@ -123,9 +136,11 @@ int main(int argc, char *argv[])
 			fprintf(flog, "Skipping USB detection.\n");
 		}
 		// check if we have to make an unattended install
-		if (strstr (line, "unattended") != NULL) {		
+		if (strstr (line, "unattended") != NULL) {
 		    unattended = 1;
 		}
+		// Loading the cdrom-filesystem
+		mysystem("/sbin/modprobe iso9660");
 	}
 
 	if (unattended) {
@@ -151,8 +166,6 @@ int main(int argc, char *argv[])
 	strcpy(shortlangname, shortlangnames[choice]);
 	fprintf(flog, "Selected language: %s\n", shortlangname);
 
-	mysystem("/bin/setfont lat0-16");
-
 	newtDrawRootText(14, 0, NAME " " VERSION " - " SLOGAN );
 	newtPushHelpLine(ctr[TR_HELPLINE]);
 	sprintf (title, "%s %s - %s", NAME, VERSION, SLOGAN);
@@ -200,10 +213,6 @@ int main(int argc, char *argv[])
 		fgets(sourcedrive, 5, handle);
 		fprintf(flog, "Source drive: %s\n", sourcedrive);
 		fclose(handle);
-
-		snprintf(cdromparams.devnode, STRING_SIZE, "/dev/%s", sourcedrive);
-		cdromparams.module = 0;
-		fprintf(flog, "Source device: %s\n", cdromparams.devnode);
 	}
 
  	/* Configure the network now! */
@@ -220,72 +229,116 @@ int main(int argc, char *argv[])
 			goto EXIT;
 		}
 	}
-
-	/* Get device for the HD.  This has to succeed. */
-	if (!(hdletter = findidetype(IDE_HD)))
-	{
-		/* Need to clean this up at some point */
-		if (!try_scsi("sda") || strstr(sourcedrive, "sda") != NULL) {
-			if (!try_scsi("ida/c0d0")) {
-				if (!try_scsi("cciss/c0d0")) {
-					if (!try_scsi("rd/c0d0")) {
-						if (!try_scsi("ataraid/d0")) {
-							errorbox(ctr[TR_NO_HARDDISK]);
-							goto EXIT;
-						} else {
-							raid_disk = 1;
-							sprintf(harddrive, "ataraid/d0");
-						}
-					} else {
-						raid_disk = 1;
-						sprintf(harddrive, "rd/c0d0");
-					}
-				} else {
-					raid_disk = 1;
-					sprintf(harddrive, "cciss/c0d0");
+	
+	i = 0;
+	while (found == 0) {
+		i++;
+		fprintf(flog, "Harddisk scan pass %i\n", i);
+
+		switch (mysystem("/bin/mountdest.sh") % 255) {
+			case 0: // Found IDE disk
+				scsi_disk = 0;
+				found = 1;
+				break;
+			case 1: // Found SCSI disk
+				scsi_disk = 1;
+				found = 1;
+				break;
+			case 10: // No harddisk found
+				if (firstrun == 1) {
+					errorbox(ctr[TR_NO_HARDDISK]);
+					goto EXIT;
 				}
-			} else {
-				raid_disk = 1;
-				sprintf(harddrive, "ida/c0d0");
-			}
-		} else {
-		    if (strstr(sourcedrive, "sda") != NULL) {
-			// probably installing from usb stick, try sdb
-			if (try_scsi("sdb")) {
-			    sprintf(harddrive, "sdb");
-			}
-			else {
-			    errorbox(ctr[TR_NO_HARDDISK]);
-			    goto EXIT;
-			}
-		    }
-		    else {
-			sprintf(harddrive, "sda");
-		    }
+				// Do this if the kudzu-scan fails...
+				runcommandwithstatus("/bin/probehw.sh deep-scan", ctr[TR_PROBING_HARDWARE]);
+				firstrun = 1;
 		}
-		scsi_disk = 1;
-	} else
-		sprintf(harddrive, "hd%c", hdletter);
+	}
 
-	fprintf(flog, "Destination drive: %s\n", harddrive);
+	/*
+	// Need to clean this up at some point
+	// scsi disk is sdb/sdc when sda/sdb is used for usb-key
+	// if scsi-disk is sdd or more, it is not discovered
+	// Support only 2 usb keys, none could be unplugged
+	if (checkusb("sdb") && try_scsi("sdc")) {
+		scsi_disk = 1;
+		sprintf(harddrive, "sdc");
+		goto FOUND_DESTINATION;
+	}
+	if (checkusb("sda") && try_scsi("sdb")) {
+		scsi_disk = 1;
+		sprintf(harddrive, "sdb");
+		goto FOUND_DESTINATION;
+	}
+	if (try_scsi("sda")) {
+		scsi_disk = 1;
+		sprintf(harddrive, "sda");
+		goto FOUND_DESTINATION;
+	}
+	if (try_scsi("ida/c0d0")) {
+		raid_disk = 1;
+		sprintf(harddrive, "ida/c0d0");
+		goto FOUND_DESTINATION;
+	}
+	if (try_scsi("cciss/c0d0")) {
+		raid_disk = 1;
+		sprintf(harddrive, "cciss/c0d0");
+		goto FOUND_DESTINATION;
+	}
+	if (try_scsi("rd/c0d0")) {
+		raid_disk = 1;
+		sprintf(harddrive, "rd/c0d0");
+		goto FOUND_DESTINATION;
+	}
+	if (try_scsi("ataraid/d0")) {
+		raid_disk = 1;
+		sprintf(harddrive, "ataraid/d0");
+		goto FOUND_DESTINATION;
+	} */
 
+	FOUND_DESTINATION:
+	if ((handle = fopen("/tmp/dest_device", "r")) == NULL) {
+		errorbox(ctr[TR_NO_HARDDISK]);
+		goto EXIT;
+	}
+	fgets(harddrive, 5, handle);
+	fclose(handle);
+			
 	/* load unattended configuration */
 	if (unattended) {
 	    fprintf(flog, "unattended: Reading unattended.conf\n");
 
 	    (void) readkeyvalues(unattendedkv, UNATTENDED_CONF);
 	}
-
-	/* Make the hdparms struct and print the contents. */
-	snprintf(hdparams.devnode, STRING_SIZE, "/dev/%s", harddrive);
-	hdparams.module = 0;
-
-	sprintf(message, ctr[TR_PREPARE_HARDDISK], hdparams.devnode);
 	
+	/* Make the hdparms struct and print the contents.
+	   With USB-KEY install and SCSI disk, while installing, the disk
+	   is named 'sdb,sdc,...' (following keys)
+	   On reboot, it will become 'sda'
+	   To avoid many test, all names are built in the struct.
+	*/
+	sprintf(hdparams.devnode_disk, "/dev/%s", harddrive);
+	/* Address the partition or raid partition (eg dev/sda or /dev/sdap1 */
+	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);
+	
+	sprintf(message, ctr[TR_PREPARE_HARDDISK], hdparams.devnode_disk);
 	if (unattended) {
 	    hardyn = 1;
 	}
-	
+
+	yesnoharddisk[0] = ctr[TR_NO];
+	yesnoharddisk[1] = ctr[TR_YES];
+	yesnoharddisk[2] = NULL;
+
 	while (! hardyn) {
 		rc = newtWinMenu(title, message,
 				 50, 5, 5, 6, yesnoharddisk,
@@ -294,7 +347,6 @@ int main(int argc, char *argv[])
 		if (rc == 2)
 			goto EXIT;
 	}
-
 	if (rc == 2)
 		goto EXIT;
 
@@ -383,7 +435,7 @@ int main(int argc, char *argv[])
 
 	fclose(handle);
 
-	snprintf(commandstring, STRING_SIZE, "/bin/sfdisk -L -uM %s < /tmp/partitiontable", hdparams.devnode);
+	snprintf(commandstring, STRING_SIZE, "/bin/sfdisk -L -uM %s < /tmp/partitiontable", hdparams.devnode_disk);
 	if (runcommandwithstatus(commandstring, ctr[TR_PARTITIONING_DISK]))
 	{
 		errorbox(ctr[TR_UNABLE_TO_PARTITION]);
@@ -392,10 +444,7 @@ int main(int argc, char *argv[])
 
 	mysystem("/sbin/udevstart");
 
-	if (raid_disk)
-		snprintf(commandstring, STRING_SIZE, "/bin/mke2fs -T ext2 -c %sp1", hdparams.devnode);
-	else
-		snprintf(commandstring, STRING_SIZE, "/bin/mke2fs -T ext2 -c %s1", hdparams.devnode);
+	snprintf(commandstring, STRING_SIZE, "/bin/mke2fs -T ext2 -c %s1", hdparams.devnode_part);
 	if (runcommandwithstatus(commandstring, ctr[TR_MAKING_BOOT_FILESYSTEM]))
 	{
 		errorbox(ctr[TR_UNABLE_TO_MAKE_BOOT_FILESYSTEM]);
@@ -403,10 +452,7 @@ int main(int argc, char *argv[])
 	}
 
 	if (swap_file) {
-		if (raid_disk)
-			snprintf(commandstring, STRING_SIZE, "/sbin/mkswap %sp2", hdparams.devnode);	
-		else
-			snprintf(commandstring, STRING_SIZE, "/sbin/mkswap %s2", hdparams.devnode);
+		snprintf(commandstring, STRING_SIZE, "/sbin/mkswap %s2", hdparams.devnode_part);
 		if (runcommandwithstatus(commandstring, ctr[TR_MAKING_SWAPSPACE]))
 		{
 			errorbox(ctr[TR_UNABLE_TO_MAKE_SWAPSPACE]);
@@ -414,22 +460,14 @@ int main(int argc, char *argv[])
 		}
 	}
 
-	if (raid_disk)
-		snprintf(commandstring, STRING_SIZE, "/sbin/mkreiserfs -f %sp3", hdparams.devnode);	
-	else
-		snprintf(commandstring, STRING_SIZE, "/sbin/mkreiserfs -f %s3", hdparams.devnode);	
-
+	snprintf(commandstring, STRING_SIZE, "/sbin/mkreiserfs -f %s3", hdparams.devnode_part);
 	if (runcommandwithstatus(commandstring, ctr[TR_MAKING_ROOT_FILESYSTEM]))
 	{
 		errorbox(ctr[TR_UNABLE_TO_MAKE_ROOT_FILESYSTEM]);
 		goto EXIT;
 	}
 
-	if (raid_disk)
-		snprintf(commandstring, STRING_SIZE, "/sbin/mkreiserfs -f %sp4", hdparams.devnode);	
-	else
-		snprintf(commandstring, STRING_SIZE, "/sbin/mkreiserfs -f %s4", hdparams.devnode);	
-
+	snprintf(commandstring, STRING_SIZE, "/sbin/mkreiserfs -f %s4", hdparams.devnode_part);	
 	if (runcommandwithstatus(commandstring, ctr[TR_MAKING_LOG_FILESYSTEM]))
 	{
 		errorbox(ctr[TR_UNABLE_TO_MAKE_ROOT_FILESYSTEM]);
@@ -437,10 +475,9 @@ int main(int argc, char *argv[])
 	}
 
 	/* Mount harddisk. */
-	if (raid_disk)
-		snprintf(commandstring, STRING_SIZE, "/bin/mount %sp3 /harddisk", hdparams.devnode);
-	else
-		snprintf(commandstring, STRING_SIZE, "/bin/mount %s3 /harddisk", hdparams.devnode);
+	mysystem("/sbin/modprobe reiserfs"); // to be banished...
+
+	snprintf(commandstring, STRING_SIZE, "/bin/mount %s3 /harddisk", hdparams.devnode_part);
 	if (runcommandwithstatus(commandstring, ctr[TR_MOUNTING_ROOT_FILESYSTEM]))
 	{
 		errorbox(ctr[TR_UNABLE_TO_MOUNT_ROOT_FILESYSTEM]);
@@ -451,31 +488,21 @@ int main(int argc, char *argv[])
 	mkdir("/harddisk/var", S_IRWXU|S_IRWXG|S_IRWXO);
 	mkdir("/harddisk/var/log", S_IRWXU|S_IRWXG|S_IRWXO);
 	
-	if (raid_disk)
-		snprintf(commandstring, STRING_SIZE, "/bin/mount %sp1 /harddisk/boot", hdparams.devnode);
-	else
-		snprintf(commandstring, STRING_SIZE, "/bin/mount %s1 /harddisk/boot", hdparams.devnode);
-
+	snprintf(commandstring, STRING_SIZE, "/bin/mount %s1 /harddisk/boot", hdparams.devnode_part);
 	if (runcommandwithstatus(commandstring, ctr[TR_MOUNTING_BOOT_FILESYSTEM]))
 	{
 		errorbox(ctr[TR_UNABLE_TO_MOUNT_BOOT_FILESYSTEM]);
 		goto EXIT;
 	}
 	if (swap_file) {
-		if (raid_disk)
-			snprintf(commandstring, STRING_SIZE, "/sbin/swapon %sp2", hdparams.devnode);
-		else
-			snprintf(commandstring, STRING_SIZE, "/sbin/swapon %s2", hdparams.devnode);
+		snprintf(commandstring, STRING_SIZE, "/sbin/swapon %s2", hdparams.devnode_part);
 		if (runcommandwithstatus(commandstring, ctr[TR_MOUNTING_SWAP_PARTITION]))
 		{
 			errorbox(ctr[TR_UNABLE_TO_MOUNT_SWAP_PARTITION]);
 			goto EXIT;
 		}
 	}
-	if (raid_disk)
-		snprintf(commandstring, STRING_SIZE, "/bin/mount %sp4 /harddisk/var", hdparams.devnode);
-	else
-		snprintf(commandstring, STRING_SIZE, "/bin/mount %s4 /harddisk/var", hdparams.devnode);
+	snprintf(commandstring, STRING_SIZE, "/bin/mount %s4 /harddisk/var", hdparams.devnode_part);
 	if (runcommandwithstatus(commandstring, ctr[TR_MOUNTING_LOG_FILESYSTEM]))
 	{
 		errorbox(ctr[TR_UNABLE_TO_MOUNT_LOG_FILESYSTEM]);
@@ -487,7 +514,7 @@ int main(int argc, char *argv[])
 			"/bin/wget -q -O - %s/" SNAME "-" VERSION ".tbz2 | /bin/tar -C /harddisk -xvjf -", url);
 	}
 
-	if (installtype == CDROM_INSTALL) {	
+	if (installtype == CDROM_INSTALL) {
 		snprintf(commandstring, STRING_SIZE,
 			"/bin/tar -C /harddisk -xvjf /cdrom/" SNAME "-" VERSION ".tbz2");
 	}
@@ -520,8 +547,9 @@ int main(int argc, char *argv[])
 
 	/* mount proc filesystem */
 	mysystem("mkdir /harddisk/proc");
-	mysystem("/bin/mount -t proc none /harddisk/proc");
-	mysystem("/bin/mount --bind /dev /harddisk/dev");
+	mysystem("/bin/mount --bind /proc /harddisk/proc");
+	mysystem("/bin/mount --bind /dev  /harddisk/dev");
+	mysystem("/bin/mount --bind /sys  /harddisk/sys");
 
 	/* Build cache lang file */
 	snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /usr/bin/perl -e \"require '" CONFIG_ROOT "/lang.pl'; &Lang::BuildCacheLang\"");
@@ -532,34 +560,17 @@ int main(int argc, char *argv[])
 	}
 
 	/* Update /etc/fstab */
-	replace("/harddisk/etc/fstab", "DEVICE", hdparams.devnode);
+	replace("/harddisk/etc/fstab", "DEVICE", hdparams.devnode_part_run);
 
-	/* if we detected SCSI/USB then fixup */
-/*	mysystem("/bin/probecntrl.sh");
-	if ((handle = fopen("/tmp/cntrldriver", "r")))
-	{
-		char *driver;
-		fgets(line, STRING_SIZE-1, handle);
-		fclose(handle);
-		line[strlen(line) - 1] = 0;
-		driver = strtok(line, ".");
-		if (strlen(driver) > 1) {
-			fprintf(flog, "Fixing up ipfirerd.img\n");
-			mkdir("/harddisk/initrd", S_IRWXU|S_IRWXG|S_IRWXO);
-			snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitrd --with=scsi_mod %s --with=sd_mod --with=sr_mod /boot/ipfirerd.img %s-ipfire", driver, KERNEL_VERSION);
-			runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
-			snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitrd --with=scsi_mod %s --with=sd_mod --with=sr_mod /boot/ipfirerd-smp.img %s-ipfire-smp", driver, KERNEL_VERSION);
-			runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
-			mysystem("/sbin/chroot /harddisk /bin/mv /boot/grub/scsigrub.conf /boot/grub/grub.conf");
-		}
-	} */
+	/* Going to make our initrd... */
+	snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -v -g /boot/ipfirerd.img -k %s-ipfire", KERNEL_VERSION);
+	runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
+	snprintf(commandstring, STRING_SIZE, "/sbin/chroot /harddisk /sbin/mkinitcpio -v -g /boot/ipfirerd-smp.img -k %s-ipfire-smp", KERNEL_VERSION);
+	runcommandwithstatus(commandstring, ctr[TR_BUILDING_INITRD]);
 
-	if (raid_disk)
-		sprintf(string, "root=%sp3", hdparams.devnode);
-	else
-		sprintf(string, "root=%s3", hdparams.devnode);
+	sprintf(string, "root=%s3", hdparams.devnode_part_run);
 	replace( "/harddisk/boot/grub/grub.conf", "root=ROOT", string);
-	replace( "/harddisk/boot/grub/grubbatch", "DEVICE", hdparams.devnode);
+	replace( "/harddisk/boot/grub/grubbatch", "DEVICE", hdparams.devnode_disk);
 
 	/* restore permissions */
 	chmod("/harddisk/boot/grub/grubbatch", S_IXUSR | S_IRUSR | S_IXGRP | S_IRGRP | S_IXOTH | S_IROTH);
@@ -572,15 +583,13 @@ int main(int argc, char *argv[])
 	}
 
 	/* Install bootsplash */
-	mysystem("/bin/installbootsplash.sh");
+	// mysystem("/bin/installbootsplash.sh"); We cannot use this at the moment, it conflicts with our initrds...
 
 	mysystem("ln -s grub.conf /harddisk/boot/grub/menu.lst");
-	mysystem("umount /harddisk/proc");
-	mysystem("umount /harddisk/dev");
 
 	if (!unattended) {
 		sprintf(message, ctr[TR_CONGRATULATIONS_LONG],
-				NAME, SNAME, SNAME, NAME, NAME, NAME);
+				NAME, SNAME, NAME);
 		newtWinMessage(ctr[TR_CONGRATULATIONS], ctr[TR_OK], message);
 	}
 	         
@@ -596,51 +605,50 @@ EXIT:
 
 	if (allok && !allok_fastexit)
 	{
-		/* /proc is needed by the module checker.  We have to mount it
-		 * so it can be seen by setup, which is run chrooted. */
-		if (system("/bin/mount proc -t proc /harddisk/proc"))
-			printf("Unable to mount proc in /harddisk.");
-		else
-		{
-			if (unattended) {
-			    fprintf(flog, "Entering unattended setup\n");
-			    if (unattended_setup(unattendedkv)) {
+		if (unattended) {
+			fprintf(flog, "Entering unattended setup\n");
+			if (unattended_setup(unattendedkv)) {
 				snprintf(commandstring, STRING_SIZE, "/bin/sleep 10");
 				runcommandwithstatus(commandstring, "Unattended installation finished, system will reboot");
-			    } else {
+			} else {
 				errorbox("Unattended setup failed.");
 				goto EXIT;
-			    }
 			}
+		}
 
-			newtFinished();
-			fflush(flog);
-			fclose(flog);
-
-			if (!unattended) {
-					// Copy our scanned nics to the disk and lock because scan doesn't work in chroot
-					system("touch /harddisk/var/ipfire/ethernet/scan_lock");
-					system("cp -f /tmp/scanned_nics /harddisk/var/ipfire/ethernet/scanned_nics");
-			    if (system("/sbin/chroot /harddisk /usr/local/sbin/setup /dev/tty2 INSTALL"))
-				    printf("Unable to run setup.\n");
-				  system("rm -f /harddisk/var/ipfire/ethernet/scan_lock");
-			}
+		fflush(flog);
+		fclose(flog);
+		newtFinished();
 
-			if (system("/bin/umount /harddisk/proc"))
-				printf("Unable to umount /harddisk/proc.\n"); 
+		if (!unattended) {
+			// Copy our scanned nics to the disk and lock because scan doesn't work in chroot
+			system("touch /harddisk/var/ipfire/ethernet/scan_lock");
+			system("cp -f /tmp/scanned_nics /harddisk/var/ipfire/ethernet/scanned_nics");
+			if (system("/sbin/chroot /harddisk /usr/local/sbin/setup /dev/tty2 INSTALL"))
+				printf("Unable to run setup.\n");
+			system("rm -f /harddisk/var/ipfire/ethernet/scan_lock");
 		}
+
+		if (system("/bin/umount /harddisk/proc"))
+			printf("Unable to umount /harddisk/proc.\n"); 
+	} else {
+		fflush(flog);
+		fclose(flog);
+		newtFinished();
 	}
+
 	fcloseall();
 
 	if (swap_file) {
-		if (raid_disk)
-			snprintf(commandstring, STRING_SIZE, "/bin/swapoff %sp2", hdparams.devnode);
-		else
-			snprintf(commandstring, STRING_SIZE, "/bin/swapoff %s2", hdparams.devnode);
+		snprintf(commandstring, STRING_SIZE, "/bin/swapoff %s2", hdparams.devnode_part);
 	}
 
 	newtFinished();
 
+	system("/bin/umount /harddisk/proc");
+	system("/bin/umount /harddisk/dev");
+	system("/bin/umount /harddisk/sys");
+
 	system("/bin/umount /harddisk/var");
 	system("/bin/umount /harddisk/boot");
 	system("/bin/umount /harddisk");