summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-08-19 22:06:08 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-08-19 22:06:08 +0000
commit0eb7cd19866ac2ed418a077b3f057e84d84c7cdb (patch)
tree5321202b647b0c5adb3c00679256afe17345332c
parent777c8aa163bf6a9f7c303470ee8ca1d650704d46 (diff)
downloaddrakx-0eb7cd19866ac2ed418a077b3f057e84d84c7cdb.tar
drakx-0eb7cd19866ac2ed418a077b3f057e84d84c7cdb.tar.gz
drakx-0eb7cd19866ac2ed418a077b3f057e84d84c7cdb.tar.bz2
drakx-0eb7cd19866ac2ed418a077b3f057e84d84c7cdb.tar.xz
drakx-0eb7cd19866ac2ed418a077b3f057e84d84c7cdb.zip
make the devfs= mount or nomount choice based on raid-based root work
-rw-r--r--perl-install/install_steps.pm8
1 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index c1479393f..29e7d5464 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -153,6 +153,11 @@ sub doPartitionDisksAfter {
$o->{fstab} = [ fsedit::get_all_fstab($o->{all_hds}) ];
fsedit::get_root_($o->{fstab}) or die "Oops, no root partition";
+
+ # do not use devfs with root software raid
+ foreach ($o->{bootloader}{perImageAppend}) {
+ $_ .= ' devfs=' . (isRAID(fsedit::get_root($o->{fstab})) ? 'nomount' : 'mount') if !/devfs=/;
+ }
if (arch() =~ /ppc/ && detect_devices::get_mac_generation =~ /NewWorld/) {
die "Need bootstrap partition to boot system!" if !(defined $partition_table_mac::bootstrap_part);
@@ -875,9 +880,6 @@ sub miscellaneous {
local $_ = $o->{bootloader}{perImageAppend};
- # do not use devfs with root software raid
- $_ .= ' devfs=' . (isRAID(fsedit::get_root($o->{fstab})) ? 'nomount' : 'mount') if !/devfs=/;
-
if ($o->{lnx4win} and !/mem=/) {
$_ .= ' mem=' . availableRamMB() . 'M';
}