From 3d3bbf75585748b813aa3659d428b62a320ffff7 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Thu, 24 Apr 2008 12:55:14 +0000 Subject: - bootloader-config: o do not detect device.map inconsistency when "/boot" (or "/") is on Linux software raid (/dev/mdX), cf #28309 and #35714 --- perl-install/bootloader.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'perl-install/bootloader.pm') diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index bfe2379d5..c85a9271b 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -225,14 +225,14 @@ sub _may_fix_grub2dev { my ($fstab, $grub2dev, $boot_part) = @_; my $real_boot_part = fs::get::root_($fstab, 'boot') or log::l("argh... the fstab given is useless, it doesn't contain '/'"), return; + + my $real_boot_dev = $real_boot_part->{rootDevice} or return; # if /boot is on Linux RAID 1, hope things are all right... if (my $prev_boot_part = fs::get::device2part(grub2dev($boot_part, $grub2dev), $fstab)) { # the boot_device as far as grub config files say $real_boot_part == $prev_boot_part and return; } log::l("WARNING: we have detected that device.map is inconsistent with the system"); - - my $real_boot_dev = $real_boot_part->{rootDevice}; my ($hd_grub, undef, undef) = parse_grub_file($boot_part); if (my $prev_hd_grub = find { $grub2dev->{$_} eq $real_boot_dev } keys %$grub2dev) { -- cgit v1.2.1