summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-10-08 01:47:18 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-10-08 01:47:18 +0000
commitd0e2a1c7bc89a7d44a762c214b9b3e07406aac8a (patch)
tree5161a2d50bf7f7ae8e101d7bd77cf35bad5dcf25 /perl-install
parenta32380b4f3f6d3d1428616bbf8ea6faa1a2aee0c (diff)
downloaddrakx-backup-do-not-use-d0e2a1c7bc89a7d44a762c214b9b3e07406aac8a.tar
drakx-backup-do-not-use-d0e2a1c7bc89a7d44a762c214b9b3e07406aac8a.tar.gz
drakx-backup-do-not-use-d0e2a1c7bc89a7d44a762c214b9b3e07406aac8a.tar.bz2
drakx-backup-do-not-use-d0e2a1c7bc89a7d44a762c214b9b3e07406aac8a.tar.xz
drakx-backup-do-not-use-d0e2a1c7bc89a7d44a762c214b9b3e07406aac8a.zip
on a recent kernel, we remove any existing devfs= kernel option to enable udev
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/bootloader.pm11
1 files changed, 10 insertions, 1 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index ff5fc4c70..83e4fbf95 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -422,7 +422,16 @@ sub add_kernel {
type => 'image',
label => kernel_str2label($kernel_str),
});
- $v->{append} = normalize_append("$bootloader->{perImageAppend} $v->{append}");
+
+ #- normalize append and handle special options
+ {
+ my ($simple, $dict) = unpack_append("$bootloader->{perImageAppend} $v->{append}");
+ if (-e "$::prefix/sbin/udev" && $kernel_str->{version} =~ /^2\.(\d+\.\d+)/ && $1 >= 6.8) {
+ log::l("it is a recent kernel, so we remove any existing devfs= kernel option to enable udev");
+ @$dict = grep { $_->[0] ne 'devfs' } @$dict;
+ }
+ $v->{append} = pack_append($simple, $dict);
+ }
#- new versions of yaboot don't handle symlinks
$b_nolink ||= arch() =~ /ppc/;