diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-03-27 08:22:23 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-03-27 08:22:23 +0000 |
| commit | 360dabe91b296b09b62d0a1d82d4e536dc9d4d45 (patch) | |
| tree | 910392b4b97321502a137dbf06799b6a4ce84fff /perl-install/bootloader.pm | |
| parent | cb6285a37920da3efcfbaaedb7040910f5bd6f48 (diff) | |
| download | drakx-360dabe91b296b09b62d0a1d82d4e536dc9d4d45.tar drakx-360dabe91b296b09b62d0a1d82d4e536dc9d4d45.tar.gz drakx-360dabe91b296b09b62d0a1d82d4e536dc9d4d45.tar.bz2 drakx-360dabe91b296b09b62d0a1d82d4e536dc9d4d45.tar.xz drakx-360dabe91b296b09b62d0a1d82d4e536dc9d4d45.zip | |
- draksplash:
o fix reading grub conf (#39346)
also ensure we don't break $grub2dev when we're not given a valid $fstab
Diffstat (limited to 'perl-install/bootloader.pm')
| -rw-r--r-- | perl-install/bootloader.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index adca7a9d3..c35f5aad2 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -223,7 +223,8 @@ sub read_grub { sub _may_fix_grub2dev { my ($fstab, $grub2dev, $root) = @_; - my $real_root_part = fs::get::root($fstab); + my $real_root_part = fs::get::root_($fstab) or + log::l("argh... the fstab given is useless, it doesn't contain '/'"), return; if (my $prev_root_part = fs::get::device2part(grub2dev($root, $grub2dev), $fstab)) { # the root_device as far as grub config files say $real_root_part == $prev_root_part and return; |