summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-02-19 10:59:41 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-02-19 10:59:41 +0000
commit34ca6ec984639ee1532d3b4884d795051b283e37 (patch)
treeed7ca473aefe13e4c79cf208d6acde60bd476022
parent00ee7484575398f18ed470baac21697e4389a144 (diff)
downloaddrakx-34ca6ec984639ee1532d3b4884d795051b283e37.tar
drakx-34ca6ec984639ee1532d3b4884d795051b283e37.tar.gz
drakx-34ca6ec984639ee1532d3b4884d795051b283e37.tar.bz2
drakx-34ca6ec984639ee1532d3b4884d795051b283e37.tar.xz
drakx-34ca6ec984639ee1532d3b4884d795051b283e37.zip
- drakboot --boot:
o fix dropping grub "configfile" entries when switching to lilo more precisely: fix reading existing grub "configfile" entries
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/bootloader.pm4
2 files changed, 7 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 2fdc42653..f85fe91a4 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- drakboot --boot:
+ o fix dropping grub "configfile" entries when switching to lilo
+
Version 10.6.20 - 18 February 2008
- diskdrake:
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index abaee89e1..c762ba07a 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -262,6 +262,10 @@ sub read_grub_menu_lst {
$e->{type} = 'other';
$e->{kernel_or_dev} = grub2dev($e->{rootnoverify} || $e->{grub_root}, $grub2dev);
$e->{append} = "";
+ } elsif ($keyword eq 'configfile') {
+ $e->{type} = 'grub_configfile';
+ $e->{kernel_or_dev} = grub2dev($e->{rootnoverify} || $e->{grub_root}, $grub2dev);
+ $e->{configfile} = $v;
} elsif ($keyword eq 'initrd') {
$e->{initrd} = grub2file($v, $grub2dev, $fstab, $e);
} elsif ($keyword eq 'map') {