diff options
Diffstat (limited to 'draklive')
-rwxr-xr-x | draklive | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -726,15 +726,16 @@ sub build_syslinux_cfg { my $has_bootlogo = $live->{system}{gfxboot} && -e get_builddir($live) . $live->{prefix}{build}{boot} . '/syslinux/bootlogo'; my $timeout = get_bootloader_timeout($live) * 10; + my $title = $media->{title} || $live->{media}{title}; join("\n", - "default $live->{media}{title}", + "default $title", "prompt 1", "timeout $timeout", $has_bootlogo ? "gfxboot $bootlogo" : "display $help", (map { my ($name, $cmdline) = @$_; $name =~ s/\s/_/g; - "label " . ($name || $live->{media}{title}), + "label " . ($name || $title), " kernel $kernel", " append initrd=$initrd $append $cmdline"; } group_by2('' => '', @{$live->{system}{boot_entries}})), @@ -755,13 +756,14 @@ sub build_grub_cfg_raw { #- FIXME: use the bootloader module from drakx my $grub_part = "(hd0" . (defined $part_nb ? "," . ($part_nb-1) : "") . ")"; my $boot = get_media_prefix($live, 'boot'); #- FIXME handle boot media + my $title = $media->{title} || $live->{media}{title}; join("\n", "timeout " . get_bootloader_timeout($live), if_($live->{system}{gfxboot}, "gfxmenu $grub_part" . $boot . "/gfxmenu"), "default 0", (map { my ($name, $cmdline) = @$_; - "title " . $live->{media}{title} . if_($name, " ($name)"), + "title " . $title . if_($name, " ($name)"), "kernel $grub_part" . $boot . "/vmlinuz " . get_default_append($live, $opts) . if_($cmdline, " $cmdline"), "initrd " . $boot . $initrd; } group_by2('' => '', @{$live->{system}{boot_entries}})), |