[Fai-commit] r5630 - in trunk: bin debian lib/setup-storage

[Michael Tautschnig]

Author: mt
Date: 2009-10-30 15:00:31 +0000 (Fri, 30 Oct 2009)
New Revision: 5630

Modified:
   trunk/bin/setup-storage
   trunk/debian/changelog
   trunk/lib/setup-storage/Commands.pm
   trunk/lib/setup-storage/Parser.pm
Log:
merged patch from experimental, bumped setup-storage version to 1.1.2


Modified: trunk/bin/setup-storage
===================================================================
--- trunk/bin/setup-storage	2009-10-30 14:38:41 UTC (rev 5629)
+++ trunk/bin/setup-storage	2009-10-30 15:00:31 UTC (rev 5630)
@@ -52,7 +52,7 @@
 
 package FAI;
 
-my $version = "1.1.1";
+my $version = "1.1.2";
 
 # command line parameter handling
 use Getopt::Std;

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-10-30 14:38:41 UTC (rev 5629)
+++ trunk/debian/changelog	2009-10-30 15:00:31 UTC (rev 5630)
@@ -145,6 +145,8 @@
   * setup-storage/Parser.pm: RAID device parsing: $2 doesn't refer to the
     original expression anymore, store earlier $2 as $opts; don't use options
     sub-hash (thanks Andreas Schockenhoff for lots of testing and feedback).
+    setup-storage/Parser.pm: LVM volume groups or RAID arrays may now refer to
+    diskX to use the entire disk (thanks Mathieu Alorent).
   * setup-storage/Sizes.pm: Properly deal with missing (as in RAID specs) or
     non-existing (user error) devices in estimate_size; don't do stupid divide
     by 2 in RAID1 setup. (closes: #525138)
@@ -160,7 +162,7 @@
   * man/setup-storage.8: Document possible problems with previous software
     RAID partitions and missing bootable flags.
   * setup-storage/Sizes.pm: Secondary GPT only requires 33 sectors.
-  * Bumped setup-storage version number to 1.1.1.
+  * Bumped setup-storage version number to 1.1.2.
  
   [ Holger Levsen ]
   * update to standards version 3.8.2, no changes needed

Modified: trunk/lib/setup-storage/Commands.pm
===================================================================
--- trunk/lib/setup-storage/Commands.pm	2009-10-30 14:38:41 UTC (rev 5629)
+++ trunk/lib/setup-storage/Commands.pm	2009-10-30 15:00:31 UTC (rev 5630)
@@ -153,9 +153,10 @@
   # make sure this device really exists (we can't check for the partition
   # as that may be created later on
   (-b $disk) or die "Specified disk $disk does not exist in this system!\n";
-  # set the raid flag
-  &FAI::push_command( "parted -s $disk set $part_no $t on", "exist_$d",
-    "type_${t}_$d" );
+  # set the raid/lvm unless this is an entire disk flag
+  my $cmd = "parted -s $disk set $part_no $t on";
+  $cmd = "true" if ($part_no == -1);
+  &FAI::push_command( $cmd, "exist_$d", "type_${t}_$d" );
 }
 
 ################################################################################

Modified: trunk/lib/setup-storage/Parser.pm
===================================================================
--- trunk/lib/setup-storage/Parser.pm	2009-10-30 14:38:41 UTC (rev 5629)
+++ trunk/lib/setup-storage/Parser.pm	2009-10-30 15:00:31 UTC (rev 5630)
@@ -614,6 +614,8 @@
             unless ($dev =~ m{^/}) {
               if ($dev =~ m/^disk(\d+)\.(\d+)/) {
                 $dev = &FAI::make_device_name("/dev/" . $FAI::disks[ $1 - 1 ], $2);
+              } elsif ($dev =~ m/^disk(\d+)/) {
+                $dev = "/dev/" . $FAI::disks[ $1 - 1 ];
               } else {
                 $dev = "/dev/$dev";
               }