summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2013-04-04 13:59:32 +0000
committerThierry Vignaud <tv@mageia.org>2013-04-04 13:59:32 +0000
commitb7121903f8996a1a2aec3c877e6cade6a72c8f35 (patch)
tree46145386728dffcce96fbc50defb23253fa50f8e
parent43e8aa682bf5bb022d656ac643d88ce908e8d4d4 (diff)
downloaddrakx-b7121903f8996a1a2aec3c877e6cade6a72c8f35.tar
drakx-b7121903f8996a1a2aec3c877e6cade6a72c8f35.tar.gz
drakx-b7121903f8996a1a2aec3c877e6cade6a72c8f35.tar.bz2
drakx-b7121903f8996a1a2aec3c877e6cade6a72c8f35.tar.xz
drakx-b7121903f8996a1a2aec3c877e6cade6a72c8f35.zip
try harder to lookup / partition y looking at mounted points (mga#8717)
-rw-r--r--perl-install/NEWS1
-rwxr-xr-xperl-install/standalone/bootloader-config1
2 files changed, 2 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 14dcab4e2..105de63b0 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,6 +1,7 @@
- bootloader-config:
o fix adding bogus bootloader entries (root=/dev/) when silently
failing to lookup / partition (mga#8717)
+ o try harder to lookup / partition y looking at mounted points (mga#8717)
Version 15.32 - 31 March 2013
diff --git a/perl-install/standalone/bootloader-config b/perl-install/standalone/bootloader-config
index 1eea07bce..1595d30f9 100755
--- a/perl-install/standalone/bootloader-config
+++ b/perl-install/standalone/bootloader-config
@@ -154,6 +154,7 @@ sub add_kernel() {
}
my $root_part = fs::get::root_([ fs::get::fstab($all_hds) ]) or warn "cannot find root partition in /etc/fstab\n";
+ $root_part ||= fs::get::root_from_mounted() or die "cannot find root partition\n";
my %opts = (
root => fs::wild_device::from_part('', $root_part),
initrd_options => $initrd_options,