From f04cae4ca3dea07ce237410905c2b2f731686f5e Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 1 Jul 2005 06:05:43 +0000
Subject: handle vgreduce

---
 perl-install/diskdrake/interactive.pm |  8 ++++++--
 perl-install/lvm.pm                   | 10 ++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index dfb5c59fb..c98331449 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -885,8 +885,12 @@ sub RemoveFromLVM {
     my ($_in, $_hd, $part, $all_hds) = @_;
     isPartOfLVM($part) or die;
     my ($lvm, $other_lvms) = partition { $_->{VG_name} eq $part->{lvm} } @{$all_hds->{lvms}};
-    lvm::vg_destroy($lvm->[0]);
-    $all_hds->{lvms} = $other_lvms;
+    if (@{$lvm->[0]{disks}} > 1) {
+	lvm::vg_reduce($lvm->[0], $part);
+    } else {
+	lvm::vg_destroy($lvm->[0]);
+	$all_hds->{lvms} = $other_lvms;
+    }
 }
 sub ModifyRAID { 
     my ($in, $_hd, $part, $all_hds) = @_;
diff --git a/perl-install/lvm.pm b/perl-install/lvm.pm
index 3563af941..5fb17e791 100644
--- a/perl-install/lvm.pm
+++ b/perl-install/lvm.pm
@@ -111,6 +111,16 @@ sub vg_add {
     lvm_cmd_or_die($prog, $part->{lvm}, $dev);
 }
 
+sub vg_reduce {
+    my ($lvm_vg, $part_pv) = @_;
+
+    lvm_cmd('vgchange', '-a', 'n', $lvm_vg->{VG_name});
+    lvm_cmd('vgreduce', $lvm_vg->{VG_name}, devices::make($part_pv->{device})) or die N("Physical volume %s is still in use.", $part_pv->{device});
+    @{$lvm_vg->{disks}} = difference2($lvm_vg->{disks}, [ $part_pv ]);
+    delete $part_pv->{lvm};
+    set_isFormatted($part_pv, 0);
+}
+
 sub vg_destroy {
     my ($lvm) = @_;
 
-- 
cgit v1.2.1