diff options
| author | Olivier Blin <oblin@mandriva.com> | 2009-10-19 14:23:06 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2009-10-19 14:23:06 +0000 |
| commit | 80538070564c6491da97acd0e562ea0b43f40930 (patch) | |
| tree | 6b539ed5648af386a4d7fa4c855ddf6b935dba12 | |
| parent | 5b0e9bba5c3a2a9417f9c1a76e53a6400fdd799e (diff) | |
| download | draklive-80538070564c6491da97acd0e562ea0b43f40930.tar draklive-80538070564c6491da97acd0e562ea0b43f40930.tar.gz draklive-80538070564c6491da97acd0e562ea0b43f40930.tar.bz2 draklive-80538070564c6491da97acd0e562ea0b43f40930.tar.xz draklive-80538070564c6491da97acd0e562ea0b43f40930.zip | |
do not default boot entry if media->{boot_entries} is specified
(to allow having a custom default entry)
| -rwxr-xr-x | draklive | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -121,6 +121,9 @@ sub build_grub_cfg_raw { $media->{partitions}[$part_idx]{mntpoint} eq $boot and $boot = ""; my $title = $media->{title} || $live->{media}{title}; + my @boot_entries = @{$media->{boot_entries}}; + @boot_entries = ('' => '') if !@boot_entries; + join("\n", "timeout " . get_bootloader_timeout($live), if_($live->{system}{gfxboot}, "gfxmenu $grub_part" . $boot . "/gfxmenu"), @@ -130,7 +133,7 @@ sub build_grub_cfg_raw { "title " . $title . if_($name, " ($name)"), "kernel $grub_part" . $boot . "/vmlinuz " . get_default_append($live, $opts) . if_($cmdline, " $cmdline"), if_($initrd, "initrd " . $boot . $initrd); - } group_by2('' => '', @{$media->{boot_entries}})), + } group_by2(@boot_entries)), ($live->{oem_rescue} && defined $opts->{oem_rescue_idx} ? ( #- FIXME: factorize with above, build_grub_cfg_entry($media) "title " . $live->{oem_rescue}{media}{title}, |