summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-09-14 11:28:45 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-09-14 11:28:45 +0000
commitc5d5913bbb76ea2fc2d17d579b1815cf01e24221 (patch)
tree96662142f62dec437ac2a958ed7624b845d68d20 /perl-install
parent4d99ad95c82264377918c4738cf2c055361bbcda (diff)
downloaddrakx-c5d5913bbb76ea2fc2d17d579b1815cf01e24221.tar
drakx-c5d5913bbb76ea2fc2d17d579b1815cf01e24221.tar.gz
drakx-c5d5913bbb76ea2fc2d17d579b1815cf01e24221.tar.bz2
drakx-c5d5913bbb76ea2fc2d17d579b1815cf01e24221.tar.xz
drakx-c5d5913bbb76ea2fc2d17d579b1815cf01e24221.zip
new option "nodmraid" do ensure we don't use dmraid
(useful since dmraid can be unused by the user but still half working as far as dmraid knows)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/fsedit.pm2
-rw-r--r--perl-install/install2.pm1
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index eea89eba5..1df2f39c2 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -128,7 +128,7 @@ sub get_hds {
my @drives = detect_devices::hds();
#- replace drives used in dmraid by the merged name
- handle_dmraid(\@drives);
+ handle_dmraid(\@drives) if !$flags->{nodmraid};
foreach my $hd (@drives) {
$hd->{file} = devices::make($hd->{device});
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index b128b9d38..7159beef3 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -365,6 +365,7 @@ sub main {
meta_class => sub { $o->{meta_class} = $v },
freedriver => sub { $o->{freedriver} = $v },
no_bad_drives => sub { $o->{partitioning}{no_bad_drives} = 1 },
+ nodmraid => sub { $o->{partitioning}{no_dmraid} = 1 },
readonly => sub { $o->{partitioning}{readonly} = $v ne "0" },
display => sub { $o->{display} = $v },
askdisplay => sub { print "Please enter the X11 display to perform the install on ? "; $o->{display} = chomp_(scalar(<STDIN>)) },