summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-01-28 09:36:14 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-01-28 09:36:14 +0000
commita9c6810b47d7cc45e1edfd84a22333c508416331 (patch)
treebc9ced2392560c2f78e858234473ef6d24f034ef
parent5722bc56a87a286f77e0f6176ba51485185fe96d (diff)
downloaddrakx-a9c6810b47d7cc45e1edfd84a22333c508416331.tar
drakx-a9c6810b47d7cc45e1edfd84a22333c508416331.tar.gz
drakx-a9c6810b47d7cc45e1edfd84a22333c508416331.tar.bz2
drakx-a9c6810b47d7cc45e1edfd84a22333c508416331.tar.xz
drakx-a9c6810b47d7cc45e1edfd84a22333c508416331.zip
- bootloader-config:
o do not drop "lock" in chainload entries from grub's menu.lst
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/bootloader.pm1
2 files changed, 4 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index c745afe85..7d4d48563 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- bootloader-config:
+ o do not drop "lock" in chainload entries from grub's menu.lst
+
Version 10.6.9 - 25 January 2008
- harddrake:
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index f8b304651..d7435cd7e 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -1634,6 +1634,7 @@ sub write_grub {
next;
}
push @conf, $title;
+ push @conf, grep { $entry->{$_} } 'lock';
push @conf, join(' ', $entry->{rootnoverify} ? 'rootnoverify' : 'root', $dev);
if ($entry->{table}) {