summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-01-24 11:52:22 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-01-24 11:52:22 +0000
commit760a680c3b5bc40c4cf61ee15d9c1f7423460c58 (patch)
treeef258a2c9e30c4cd9506801c240cc9f028cd6d59
parent63f0749ac14309ee1fa52154740724c786d22f0d (diff)
downloaddrakx-760a680c3b5bc40c4cf61ee15d9c1f7423460c58.tar
drakx-760a680c3b5bc40c4cf61ee15d9c1f7423460c58.tar.gz
drakx-760a680c3b5bc40c4cf61ee15d9c1f7423460c58.tar.bz2
drakx-760a680c3b5bc40c4cf61ee15d9c1f7423460c58.tar.xz
drakx-760a680c3b5bc40c4cf61ee15d9c1f7423460c58.zip
put devfs=mount only if devfsd is installed
-rw-r--r--perl-install/install_steps.pm11
1 files 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';