summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-09-22 11:06:49 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-09-22 11:06:49 +0000
commit415dfc954d951b8b3a0c40e2f45f51adbc04490a (patch)
tree07913e9af3b442bbd604b81c8430d7c09fa48459 /perl-install
parentfd4b29dc554ff77303fc86eb82db77201f2067ad (diff)
downloaddrakx-415dfc954d951b8b3a0c40e2f45f51adbc04490a.tar
drakx-415dfc954d951b8b3a0c40e2f45f51adbc04490a.tar.gz
drakx-415dfc954d951b8b3a0c40e2f45f51adbc04490a.tar.bz2
drakx-415dfc954d951b8b3a0c40e2f45f51adbc04490a.tar.xz
drakx-415dfc954d951b8b3a0c40e2f45f51adbc04490a.zip
- bootloader-config:
o fix handling fd0 (regression introduced in 11.44) (#44049)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/bootloader.pm2
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 5f1663035..4c41d1cb8 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- bootloader-config:
+ o fix handling fd0 (regression introduced in 11.44) (#44049)
+
Version 11.49.2 - 22 September 2008
- fix crash (#44053)
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index a046c01b1..ce5054d62 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1567,7 +1567,7 @@ sub grub2dev_and_file {
my ($hd, $part, $rel_file) = parse_grub_file($grub_file) or return;
$grub2dev->{$hd} or internal_error("$hd has no mapping in device.map (when translating $grub_file)");
$part = $o_block_device ? '' : defined $part && $part + 1; #- grub wants "(hdX,Y)" where lilo just want "hdY+1"
- my $device = '/dev/' . devices::prefix_for_dev($grub2dev->{$hd}) . $part;
+ my $device = '/dev/' . ($part eq '' ? $grub2dev->{$hd} : devices::prefix_for_dev($grub2dev->{$hd}) . $part);
$device, $rel_file;
}
sub grub2dev {