diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2003-08-29 23:15:50 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2003-08-29 23:15:50 +0000 |
| commit | 3a26270493ecfaff905f1267853faccf4128018e (patch) | |
| tree | ca609db2ed9dcf93ec1c2ff72baec9e4cc4b0a54 | |
| parent | 94c9eea1af1943282cab19c99738149e62466c39 (diff) | |
| download | drakx-backup-do-not-use-3a26270493ecfaff905f1267853faccf4128018e.tar drakx-backup-do-not-use-3a26270493ecfaff905f1267853faccf4128018e.tar.gz drakx-backup-do-not-use-3a26270493ecfaff905f1267853faccf4128018e.tar.bz2 drakx-backup-do-not-use-3a26270493ecfaff905f1267853faccf4128018e.tar.xz drakx-backup-do-not-use-3a26270493ecfaff905f1267853faccf4128018e.zip | |
set {perImageAppend} to the append= line from the default entry or the first image= entry
| -rw-r--r-- | perl-install/bootloader.pm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 00a33a114..39b99815e 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -78,7 +78,11 @@ sub mkbootdisk { sub read() { my $file = sprintf("/etc/%s.conf", arch() =~ /sparc/ ? 'silo' : arch() =~ /ppc/ ? 'yaboot' : 'lilo'); - $file =~ /lilo/ && detect_bootloader() =~ /GRUB/ ? read_grub("/boot/grub/menu.lst") : read_lilo($file); + my $bootloader = $file =~ /lilo/ && detect_bootloader() =~ /GRUB/ ? read_grub("/boot/grub/menu.lst") : read_lilo($file); + if (my $default = find { $_ && $_->{append} } get_label($bootloader->{default}, $bootloader), @{$bootloader->{entries}}) { + $bootloader->{perImageAppend} ||= $default->{append}; + } + $bootloader; } sub read_grub { |