From 8afcf58402d2640d86353bd34ee2734530c2ab5b Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Tue, 13 Jan 2004 11:56:13 +0000 Subject: - install lvm2 rpm instead of lvm (and using ->ensure_is_installed) - "vgdisplay" error status is not good, using "vgs" instead --- perl-install/lvm.pm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/perl-install/lvm.pm b/perl-install/lvm.pm index 716880517..68e8f6e2f 100644 --- a/perl-install/lvm.pm +++ b/perl-install/lvm.pm @@ -55,9 +55,7 @@ sub lvm_cmd_or_die { sub check { my ($in) = @_; - my $f = '/sbin/pvcreate'; - -e $f or $in->do_pkgs->install('lvm'); - -e $f or $in->ask_warn('', "Mandatory package lvm is missing"), return; + $in->do_pkgs->ensure_is_installed('lvm2', '/sbin/lvm2') or return; init(); 1; } @@ -99,7 +97,7 @@ sub vg_add { my ($part) = @_; my $dev = expand_symlinks(devices::make($part->{device})); lvm_cmd_or_die('pvcreate', '-y', '-ff', $dev); - my $prog = lvm_cmd('vgdisplay', $part->{lvm}) ? 'vgextend' : 'vgcreate'; + my $prog = lvm_cmd('vgs', $part->{lvm}) ? 'vgextend' : 'vgcreate'; lvm_cmd_or_die($prog, $part->{lvm}, $dev); } -- cgit v1.2.1