[Fai-commit] r5866 - branches/experimental/patches

[Michael Tautschnig]

Author: mt
Date: 2010-07-23 10:09:04 +0000 (Fri, 23 Jul 2010)
New Revision: 5866

Modified:
   branches/experimental/patches/setup-storage_lvm-preserve2
Log:
fixing a bug when LVM is used on entire disks


Modified: branches/experimental/patches/setup-storage_lvm-preserve2
===================================================================
--- branches/experimental/patches/setup-storage_lvm-preserve2	2010-07-23 09:08:31 UTC (rev 5865)
+++ branches/experimental/patches/setup-storage_lvm-preserve2	2010-07-23 10:09:04 UTC (rev 5866)
@@ -9,7 +9,7 @@
 ===================================================================
 --- trunk.orig/lib/setup-storage/Commands.pm
 +++ trunk/lib/setup-storage/Commands.pm	
-@@ -143,7 +143,7 @@
+@@ -143,14 +143,15 @@
  
    my ($d, $t) = @_;
    my ($i_p_d, $disk, $part_no) = &FAI::phys_dev($d);
@@ -18,10 +18,11 @@
    # 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";
-@@ -151,6 +151,7 @@
+   # 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" );
+-  &FAI::push_command( $cmd, "exist_$d", "type_${t}_$d" );
++  &FAI::push_command( $cmd, "cleared2_$disk,exist_$d", "type_${t}_$d" );
 +  return 1;
  }