[patch] patch against GLIArchitectureTemplate.py

GLIArchitectureTemplate.py.diff (text/plain), 1.59 KB, created by Steven Mertens on 2005-06-16 16:09:55 UTC

--- installer/src/GLIArchitectureTemplate.py	2005-06-16 17:44:59.000000000 +0200
+++ installer-work/src/GLIArchitectureTemplate.py	2005-06-17 00:40:59.000000000 +0200
@@ -308,7 +308,7 @@
 						mountopts = "-o "+mountopts+" "
 					if partition_type:
 						partition_type = "-t "+partition_type+" "
-					parts_to_mount[mountpoint]= {0: mountopts, 1: partition_type, 2: minor}
+					parts_to_mount[mountpoint]= {0: mountopts, 1: partition_type, 2: device+minor}
 					
 				if partition_type == "linux-swap":
 					ret = GLIUtility.spawn("swapon "+device+minor)
@@ -324,12 +324,12 @@
 		for mountpoint in sorted_list:
 			mountopts = parts_to_mount[mountpoint][0]
 			partition_type = parts_to_mount[mountpoint][1]
-			minor = parts_to_mount[mountpoint][2]
+			partition = parts_to_mount[mountpoint][2]
 			if not GLIUtility.is_file(self._chroot_dir+mountpoint):
 				exitstatus = GLIUtility.spawn("mkdir -p " + self._chroot_dir + mountpoint)
 				if exitstatus != 0:
 					raise GLIException("MkdirError", 'fatal','mount_local_partitions', "Making the mount point failed!")
-			ret = GLIUtility.spawn("mount "+partition_type+mountopts+device+minor+" "+self._chroot_dir+mountpoint, display_on_tty8=True, logfile=self._compile_logfile, append_log=True)
+			ret = GLIUtility.spawn("mount "+partition_type+mountopts+partition+" "+self._chroot_dir+mountpoint, display_on_tty8=True, logfile=self._compile_logfile, append_log=True)
 			if not GLIUtility.exitsuccess(ret):
 				raise GLIException("MountError", 'fatal','mount_local_partitions','Could not mount a partition')
 			self._logger.log("Mounted mountpoint:"+mountpoint)