summaryrefslogtreecommitdiffstats
path: root/perl-install/bootloader.pm
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-06-30 05:12:57 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-06-30 05:12:57 +0000
commit0d17f37c448e201eb06acd3ab9f48987ec979f87 (patch)
tree18fecffdd3c911af066384b7b52ef21b510100c7 /perl-install/bootloader.pm
parentd9b326644aeed117f7bdbb0288a25f77f4a3d374 (diff)
downloaddrakx-0d17f37c448e201eb06acd3ab9f48987ec979f87.tar
drakx-0d17f37c448e201eb06acd3ab9f48987ec979f87.tar.gz
drakx-0d17f37c448e201eb06acd3ab9f48987ec979f87.tar.bz2
drakx-0d17f37c448e201eb06acd3ab9f48987ec979f87.tar.xz
drakx-0d17f37c448e201eb06acd3ab9f48987ec979f87.zip
Remove dependency of c::stuff on rpmlib
Diffstat (limited to 'perl-install/bootloader.pm')
-rw-r--r--perl-install/bootloader.pm6
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 505508fc0..4468e814c 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -18,7 +18,7 @@ use detect_devices;
use partition_table::raw;
use run_program;
use modules;
-
+use URPM;
#-#####################################################################################
#- Functions
@@ -481,7 +481,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+)/ && c::rpmvercmp($1, '2.6.8') >= 0) {
+ if (-e "$::prefix/sbin/udev" && $kernel_str->{version} =~ /(2\.\d+\.\d+)/ && URPM::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;
}
@@ -661,7 +661,7 @@ sub get_kernel_labels {
my ($kernels, $b_prefer_24) = @_;
my @kernels_str =
- sort { c::rpmvercmp($b->{version_no_ext}, $a->{version_no_ext}) }
+ sort { URPM::rpmvercmp($b->{version_no_ext}, $a->{version_no_ext}) }
grep { -d "$::prefix/lib/modules/$_->{version}" }
map { vmlinuz2kernel_str($_) } @$kernels;