diff options
author | Thierry Vignaud <tvignaud@mandriva.org> | 2003-05-19 14:04:50 +0000 |
---|---|---|
committer | Thierry Vignaud <tvignaud@mandriva.org> | 2003-05-19 14:04:50 +0000 |
commit | 906e4b2dbf4e16595bfd006a6dad0133600bd025 (patch) | |
tree | 86e57e1f6fee8ba9e7eafe862d5cff3c8efab991 | |
parent | adb28fd17b640bf98bdda7a31c07769b04f8acd8 (diff) | |
download | drakx-backup-do-not-use-906e4b2dbf4e16595bfd006a6dad0133600bd025.tar drakx-backup-do-not-use-906e4b2dbf4e16595bfd006a6dad0133600bd025.tar.gz drakx-backup-do-not-use-906e4b2dbf4e16595bfd006a6dad0133600bd025.tar.bz2 drakx-backup-do-not-use-906e4b2dbf4e16595bfd006a6dad0133600bd025.tar.xz drakx-backup-do-not-use-906e4b2dbf4e16595bfd006a6dad0133600bd025.zip |
let further consolidate make_label_lilo_compatible()
-rw-r--r-- | perl-install/bootloader.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 1240834a2..aad6fd806 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -47,7 +47,7 @@ sub get { } sub get_label { my ($label, $bootloader) = @_; - $_->{label} && lc(substr($_->{label}, 0, 15)) eq lc(substr($label, 0, 15)) and return $_ foreach @{$bootloader->{entries}}; + $_->{label} && lc(make_label_lilo_compatible($_->{label})) eq lc(make_label_lilo_compatible($label)) and return $_ foreach @{$bootloader->{entries}}; undef; } @@ -715,7 +715,7 @@ sub install_yaboot { $of_dev = get_of_dev($_->{root}); print F "$_->{type}=$of_dev,$_->{kernel_or_dev}"; } - print F "\tlabel=", substr($_->{label}, 0, 15); #- lilo doesn't handle more than 15 char long labels + print F "\tlabel=", make_label_lilo_compatible($_->{label}); print F "\troot=$_->{root}"; if ($boot !~ /$_->{root}/ && $boot) { print F "\tinitrd=$of_dev," . substr($_->{initrd}, 5) if $_->{initrd}; |