diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-10-27 10:07:56 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-10-27 10:07:56 +0000 |
| commit | 2890ee9dcb7cc758bdd7f08e9542b680f37e52f0 (patch) | |
| tree | 69482983dfbdd8328a6158a99deb8f83b00169be | |
| parent | 544a1b148cac7d4e3ad3ea8b4095ca3546230296 (diff) | |
| download | drakx-2890ee9dcb7cc758bdd7f08e9542b680f37e52f0.tar drakx-2890ee9dcb7cc758bdd7f08e9542b680f37e52f0.tar.gz drakx-2890ee9dcb7cc758bdd7f08e9542b680f37e52f0.tar.bz2 drakx-2890ee9dcb7cc758bdd7f08e9542b680f37e52f0.tar.xz drakx-2890ee9dcb7cc758bdd7f08e9542b680f37e52f0.zip | |
since we need mdadm, ensure we have it (bugzilla #12146)
| -rw-r--r-- | perl-install/diskdrake/interactive.pm | 1 | ||||
| -rw-r--r-- | perl-install/raid.pm | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm index 0f97ad314..83b8c3310 100644 --- a/perl-install/diskdrake/interactive.pm +++ b/perl-install/diskdrake/interactive.pm @@ -815,6 +815,7 @@ sub Add2RAID { if (ref($md_part)) { raid::add($md_part, $part); } else { + raid::check_prog($in) or return; my $md_part = raid::new($raids, disks => [ $part ]); modifyRAID($in, $raids, $md_part) or return raid::delete($raids, $md_part); } diff --git a/perl-install/raid.pm b/perl-install/raid.pm index acbee3607..1570712db 100644 --- a/perl-install/raid.pm +++ b/perl-install/raid.pm @@ -15,6 +15,11 @@ use fs; sub max_nb() { 31 } +sub check_prog { + my ($in) = @_; + $in->do_pkgs->ensure_binary_is_installed('mdadm', 'mdadm') or return; +} + sub new { my ($raids, %opts) = @_; my $md_part = { %opts }; |