- fixed quoting of parameters in config.isoclient

OSInside · Oct 27, 2011 · 88bf491 · 88bf491
1 parent d0f3c77
commit 88bf491
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/modules/KIWIBoot.pm b/modules/KIWIBoot.pm
@@ -921,7 +921,7 @@ sub setupInstallCD {
 			$kiwi -> failed ();
 			return undef;
 		}
-		print FD "IMAGE=$namecd\n";
+		print FD "IMAGE='".$namecd."'\n";
 		close FD;
 		$kiwi -> info ("Importing system image: $system");
 		$status = qxx ("mv $system $tmpdir 2>&1");
@@ -1489,7 +1489,7 @@ sub setupInstallStick {
 			$this -> cleanLoop ();
 			return undef;
 		}
-		print FD "IMAGE=$nameusb\n";
+		print FD "IMAGE='".$nameusb."'\n";
 		close FD;
 		$main::global -> umount();
 		$kiwi -> done();
@@ -2572,7 +2572,7 @@ sub setupInstallFlags {
 			qxx ("rm -rf $irddir");
 			return undef;
 		}
-		print FD "IMAGE=$namecd\n";
+		print FD "IMAGE='".$namecd."'\n";
 		close FD;
 	}
 	#==========================================

diff --git a/modules/KIWIImage.pm b/modules/KIWIImage.pm
@@ -1931,15 +1931,15 @@ sub createImageLiveCD {
 		return undef;
 	}
 	if ((! defined $gzip) || ($gzip =~ /^(unified|clic)/)) {
-		print FD "IMAGE=/dev/ram1;$namecd\n";
+		print FD "IMAGE='/dev/ram1;$namecd'\n";
 	} else {
-		print FD "IMAGE=/dev/loop1;$namecd\n";
+		print FD "IMAGE='/dev/loop1;$namecd'\n";
 	}
 	if (defined $gzip) {
 		if ($gzip =~ /^unified/) {
-			print FD "UNIONFS_CONFIG=/dev/ram1,/dev/loop1,aufs\n";
+			print FD "UNIONFS_CONFIG='/dev/ram1,/dev/loop1,aufs'\n";
 		} elsif ($gzip =~ /^clic/) {
-			print FD "UNIONFS_CONFIG=/dev/ram1,/dev/loop1,clicfs\n";
+			print FD "UNIONFS_CONFIG='/dev/ram1,/dev/loop1,clicfs'\n";
 		} else {
 			print FD "COMBINED_IMAGE=yes\n";
 		}
@@ -2885,17 +2885,17 @@ sub writeImageConfig {
 		# IMAGE information
 		#------------------------------------------
 		if (($type{compressed}) && ($type{compressed} eq 'true')) {
-			print FD "IMAGE=${device}${targetPartition};";
-			print FD "$namecd;$server;$blocks;compressed";
+			print FD "IMAGE='${device}${targetPartition};";
+			print FD "$namecd;$server;$blocks;compressed'";
 			if ("$type{type}" eq "split" && defined $this->{imageTreeRW}) {
 				print FD ",${device}${targetPartitionNext}";
 				print FD ";$namerw;$server;$blocks;compressed\n";
 			} else {
 				print FD "\n";
 			}
 		} else {
-			print FD "IMAGE=${device}${targetPartition};";
-			print FD "$namecd;$server;$blocks";
+			print FD "IMAGE='${device}${targetPartition};";
+			print FD "$namecd;$server;$blocks'";
 			if ("$type{type}" eq "split" && defined $this->{imageTreeRW}) {
 				print FD ",${device}${targetPartitionNext}";
 				print FD ";$namerw;$server;$blocks\n";
@@ -2935,7 +2935,7 @@ sub writeImageConfig {
 				$valid = 1;
 			}
 			if ($valid) {
-				print FD "UNIONFS_CONFIG=$value\n";
+				print FD "UNIONFS_CONFIG='".$value."'\n";
 			}
 		}
 		#==========================================