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

[Michael Tautschnig]

Author: mt
Date: 2010-07-02 09:45:13 +0000 (Fri, 02 Jul 2010)
New Revision: 5826

Modified:
   branches/experimental/patches/setup-storage_lvm-preserve2
Log:
proper {pv,lv}remove parameters


Modified: branches/experimental/patches/setup-storage_lvm-preserve2
===================================================================
--- branches/experimental/patches/setup-storage_lvm-preserve2	2010-07-01 22:31:00 UTC (rev 5825)
+++ branches/experimental/patches/setup-storage_lvm-preserve2	2010-07-02 09:45:13 UTC (rev 5826)
@@ -298,7 +298,7 @@
 +
 +  my $vg_destroy_pre = "vgchange_a_n";
 +  foreach my $lv (keys %{ $FAI::current_lvm_config{$vg}{volumes} }) {
-+    &FAI::push_command( "lvremove $vg/$lv", "vgchange_a_n", "lv_rm_$vg/$lv");
++    &FAI::push_command( "lvremove -f $vg/$lv", "vgchange_a_n", "lv_rm_$vg/$lv");
 +    $vg_destroy_pre .= ",lv_rm_$vg/$lv";
 +  }
 +  &FAI::push_command( "vgremove $vg", "$vg_destroy_pre", "vg_removed_$vg");
@@ -308,7 +308,7 @@
 +  $devices .= " " . &FAI::enc_name($_) foreach
 +    (@{ $FAI::current_lvm_config{$vg}{physical_volumes} });
 +  $FAI::debug and print "Erased devices:$devices\n";
-+  &FAI::push_command( "pvremove -y$devices", "", "pv_sigs_removed_$vg" );
++  &FAI::push_command( "pvremove $devices", "", "pv_sigs_removed_$vg" );
 +  return 1;
 +}
 +