summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-04-04 13:59:26 +0000
committerThierry Vignaud <tv@mageia.org>2013-04-04 13:59:26 +0000
commit0b5bf3f0964824c7a7e496e3e485bc5be265f265 (patch)
treedddf062fdeb05a8ce8da3de79c2045c13c87b8df /perl-install
parent425bd3385636d20fa165af7b9b633d68ca98de7f (diff)
downloaddrakx-0b5bf3f0964824c7a7e496e3e485bc5be265f265.tar
drakx-0b5bf3f0964824c7a7e496e3e485bc5be265f265.tar.gz
drakx-0b5bf3f0964824c7a7e496e3e485bc5be265f265.tar.bz2
drakx-0b5bf3f0964824c7a7e496e3e485bc5be265f265.tar.xz
drakx-0b5bf3f0964824c7a7e496e3e485bc5be265f265.zip
fix adding bogues bootloader entries (root=/dev/)
We were silently failing to lookup / partition (mga#8717) It was actually broken since Pixel introduced the check in commit r208774 on 2004-08-17 ("better error handling")
Diffstat (limited to 'perl-install')
-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,