From 415dfc954d951b8b3a0c40e2f45f51adbc04490a Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 22 Sep 2008 11:06:49 +0000 Subject: - bootloader-config: o fix handling fd0 (regression introduced in 11.44) (#44049) --- perl-install/bootloader.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'perl-install/bootloader.pm') 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 { -- cgit v1.2.1