From 0eb7cd19866ac2ed418a077b3f057e84d84c7cdb Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sun, 19 Aug 2001 22:06:08 +0000
Subject: make the devfs= mount or nomount choice based on raid-based root work

---
 perl-install/install_steps.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'perl-install')

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';
     }
-- 
cgit v1.2.1