From 760a680c3b5bc40c4cf61ee15d9c1f7423460c58 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 24 Jan 2002 11:52:22 +0000
Subject: put devfs=mount only if devfsd is installed

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

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index e24bac95b..c6c668bbb 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -152,9 +152,6 @@ sub doPartitionDisksAfter {
     $o->{fstab} = [ fsedit::get_all_fstab($o->{all_hds}) ];
     fsedit::get_root_($o->{fstab}) or die "Oops, no root partition";
 
-    require bootloader;
-    bootloader::may_append($o->{bootloader}, devfs => 'mount');
-    
     if (arch() =~ /ppc/ && detect_devices::get_mac_generation =~ /NewWorld/) {
 	die "Need bootstrap partition to boot system!" if !(defined $partition_table_mac::bootstrap_part);
     }
@@ -397,6 +394,14 @@ Consoles 1,3,4,7 may also contain interesting information";
     #-  why not? cuz weather is nice today :-) [pixel]
     common::sync(); common::sync();
 
+    if (do {
+	my $p = pkgs::packageByName($o->{packages}, 'devfsd');
+	$p && pkgs::packageFlagInstalled($p)
+    }) {
+        require bootloader;
+	bootloader::may_append($o->{bootloader}, devfs => 'mount');
+    }
+
     #- generate /etc/lvmtab needed for rc.sysinit
     run_program::rooted($o->{prefix}, 'vgscan') if -e '/etc/lvmtab';
 
-- 
cgit v1.2.1