Hello,

can you please also apply attached patch?
$fs can look like "linux-swap(v1)" and if not quoted you'll
get a syntax error in the calling shell.

Thanks,

  Peter

2010-10-04  Peter Kruse  <p...@q-leap.de>

	* debian/ubuntu/lucid/usr/share/fai/setup-storage/Commands.pm:
	quot fs argument to parted, can contain special character as in
	linux-swap(v1)
	[992e14977b87]

diff -r dbf4bcae0d10 -r 992e14977b87 debian/ubuntu/lucid/usr/share/fai/setup-storage/Commands.pm
--- a/debian/ubuntu/lucid/usr/share/fai/setup-storage/Commands.pm	Mon Oct 04 14:32:48 2010 +0200
+++ b/debian/ubuntu/lucid/usr/share/fai/setup-storage/Commands.pm	Mon Oct 04 15:41:15 2010 +0200
@@ -850,7 +850,7 @@
     $post .= ",rebuilt_" . &FAI::make_device_name($disk, $part_nr) if
       $FAI::configs{$config}{partitions}{$part_id}{size}{resize};
     # build a parted command to create the partition
-    &FAI::push_command( "parted -s $disk mkpart $part_type $fs ${start}B ${end}B",
+    &FAI::push_command( "parted -s $disk mkpart $part_type \"$fs\" ${start}B ${end}B",
       "cleared1_$disk", $post );
   }
 }
@@ -1043,7 +1043,7 @@
     my $pre = "";
     $pre = ",exist_" . &FAI::make_device_name($disk, $prev_id) if ($prev_id > -1);
     # build a parted command to create the partition
-    &FAI::push_command( "parted -s $disk mkpart $part_type $fs ${start}B ${end}B",
+    &FAI::push_command( "parted -s $disk mkpart $part_type \"$fs\" ${start}B ${end}B",
       "cleared2_$disk$pre", "exist_" . &FAI::make_device_name($disk, $part_id) );
     $prev_id = $part_id;
   }
@@ -1156,7 +1156,7 @@
       my $fs = $curr_part->{filesystem};
 
       # build a parted command to create the partition
-      &FAI::execute_command("parted -s $disk mkpart $part_type $fs ${start}B ${end}B");
+      &FAI::execute_command("parted -s $disk mkpart $part_type \"$fs\" ${start}B ${end}B");
     }
     warn "Partition table of disk $disk has been restored\n";
   }

Reply via email to