From 80538070564c6491da97acd0e562ea0b43f40930 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Mon, 19 Oct 2009 14:23:06 +0000 Subject: do not default boot entry if media->{boot_entries} is specified (to allow having a custom default entry) --- draklive | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/draklive b/draklive index a4d88c0..47502bd 100755 --- a/draklive +++ b/draklive @@ -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}, -- cgit v1.2.1