summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-09-19 13:55:25 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-09-19 13:55:25 +0000
commit647236e1a4d9eee6d4a822c192920af5a1e2f99a (patch)
treed63632e6904c062eed9c99e2527091834964d86c
parent4d0805d58380ee8645542919c7b3ea8b2be19114 (diff)
downloaddrakx-647236e1a4d9eee6d4a822c192920af5a1e2f99a.tar
drakx-647236e1a4d9eee6d4a822c192920af5a1e2f99a.tar.gz
drakx-647236e1a4d9eee6d4a822c192920af5a1e2f99a.tar.bz2
drakx-647236e1a4d9eee6d4a822c192920af5a1e2f99a.tar.xz
drakx-647236e1a4d9eee6d4a822c192920af5a1e2f99a.zip
- bootloader-config, drakboot:
o handle /boot/grub/install.sh with no "root (hd...)" line (this is the case for grub's installed prior to 2005-06-16) (#43786, #43431) nb: "bootloader-config --action migrate-to-uuids" should be done prior to booting with a different layout, and so /boot/grub/install.sh is regenerated and will include "root (hd...)" line
-rw-r--r--perl-install/NEWS5
-rw-r--r--perl-install/bootloader.pm3
2 files changed, 8 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index afb7924cf..c4d3b9171 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,8 @@
+- bootloader-config, drakboot:
+ o handle /boot/grub/install.sh with no "root (hd...)" line
+ (this is the case for grub's installed prior to 2005-06-16)
+ (#43786, #43431)
+
Version 11.47.1 - 17 September 2008
- bug fix: add mandatory new modules for dm-crypt
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 1bc6a05ea..a046c01b1 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -231,6 +231,9 @@ sub read_grub {
# - $grub2dev is /boot/grub/device.map
sub _may_fix_grub2dev {
my ($fstab, $grub2dev, $boot_part) = @_;
+
+ $boot_part or log::l("install.sh does not contain 'root (hd...)' line, no way to magically adapt device.map"), return;
+
my $real_boot_part = fs::get::root_($fstab, 'boot') or
log::l("argh... the fstab given is useless, it doesn't contain '/'"), return;