- draksplash:

  o fix reading grub conf (#39346)

also ensure we don't break $grub2dev when we're not given a valid $fstab

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;