summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/NEWS4
-rwxr-xr-xperl-install/standalone/bootloader-config2
2 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index f5039aec1..14dcab4e2 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,7 @@
+- bootloader-config:
+ o fix adding bogus bootloader entries (root=/dev/) when silently
+ failing to lookup / partition (mga#8717)
+
Version 15.32 - 31 March 2013
- fix detecting Xen hard disks (mga#9546)
diff --git a/perl-install/standalone/bootloader-config b/perl-install/standalone/bootloader-config
index b68cef028..1eea07bce 100755
--- a/perl-install/standalone/bootloader-config
+++ b/perl-install/standalone/bootloader-config
@@ -153,7 +153,7 @@ sub add_kernel() {
return;
}
- my $root_part = fs::get::root([ fs::get::fstab($all_hds) ]) or die "cannot find root partition\n";
+ my $root_part = fs::get::root_([ fs::get::fstab($all_hds) ]) or warn "cannot find root partition in /etc/fstab\n";
my %opts = (
root => fs::wild_device::from_part('', $root_part),
initrd_options => $initrd_options,