summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-09-25 18:25:40 +0000
committerOlivier Blin <oblin@mandriva.com>2008-09-25 18:25:40 +0000
commit755f7b5aff2ced3d1ceb4e08de51f5798776f36b (patch)
tree73df52cffd689eb8eed0a83b98e803b53aa29b9c
parent5436dc257ebec96aa002cd7c4080a9b5a017fe9e (diff)
downloaddrakiso-755f7b5aff2ced3d1ceb4e08de51f5798776f36b.tar
drakiso-755f7b5aff2ced3d1ceb4e08de51f5798776f36b.tar.gz
drakiso-755f7b5aff2ced3d1ceb4e08de51f5798776f36b.tar.bz2
drakiso-755f7b5aff2ced3d1ceb4e08de51f5798776f36b.tar.xz
drakiso-755f7b5aff2ced3d1ceb4e08de51f5798776f36b.zip
allow to customize title per media
-rwxr-xr-xdraklive8
1 files changed, 5 insertions, 3 deletions
diff --git a/draklive b/draklive
index 433595c..3b88209 100755
--- a/draklive
+++ b/draklive
@@ -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}})),