summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-04-25 10:20:10 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-04-25 10:20:10 +0000
commit7570b704830f509a0e1d02be0f539d7d55d75890 (patch)
tree930c49f4d145fe427626b1d9cd9e8f90a5a89e87
parented90eab03bfceee7ae91700d4451fc8ddb54f8cc (diff)
downloaddrakx-7570b704830f509a0e1d02be0f539d7d55d75890.tar
drakx-7570b704830f509a0e1d02be0f539d7d55d75890.tar.gz
drakx-7570b704830f509a0e1d02be0f539d7d55d75890.tar.bz2
drakx-7570b704830f509a0e1d02be0f539d7d55d75890.tar.xz
drakx-7570b704830f509a0e1d02be0f539d7d55d75890.zip
using c::rpmvercmp is cleaner
-rw-r--r--perl-install/bootloader.pm3
1 files changed, 1 insertions, 2 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index e548dfdc7..0e2b7a010 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -475,8 +475,7 @@ sub add_kernel {
#- 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 || $1 == 6 && $2 >= 8)) {
+ if (-e "$::prefix/sbin/udev" && $kernel_str->{version} =~ /(2\.\d+\.\d+)/ && c::rpmvercmp($1, '2.6.8') >= 0) {
log::l("it is a recent kernel, so we remove any existing devfs= kernel option to enable udev");
@$dict = grep { $_->[0] ne 'devfs' } @$dict;
}