summaryrefslogtreecommitdiffstats
path: root/draklive
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2007-10-25 15:17:42 +0000
committerOlivier Blin <oblin@mandriva.com>2007-10-25 15:17:42 +0000
commitb365f13a38d5416bfad974d31ee7a3e2dc680dcd (patch)
tree4d5970c5ca6bf3db504e27fdebd88fd3515c0cda /draklive
parent6d532ab23f6cdb6bcda278b607dc7d0082a5592a (diff)
downloaddrakiso-b365f13a38d5416bfad974d31ee7a3e2dc680dcd.tar
drakiso-b365f13a38d5416bfad974d31ee7a3e2dc680dcd.tar.gz
drakiso-b365f13a38d5416bfad974d31ee7a3e2dc680dcd.tar.bz2
drakiso-b365f13a38d5416bfad974d31ee7a3e2dc680dcd.tar.xz
drakiso-b365f13a38d5416bfad974d31ee7a3e2dc680dcd.zip
enable gfxboot only if $live->{system}{gfxboot} is set
Diffstat (limited to 'draklive')
-rwxr-xr-xdraklive5
1 files changed, 3 insertions, 2 deletions
diff --git a/draklive b/draklive
index 9ddf25d..fa2078b 100755
--- a/draklive
+++ b/draklive
@@ -613,7 +613,8 @@ sub build_syslinux_cfg {
my $to_root = get_boot_setting($media, 'fs', $opts) eq 'vfat';
my ($initrd, $kernel, $bootlogo, $help) = map { $to_root ? basename($_) : $_ }
map { $live->{prefix}{media}{boot} . $_ } get_initrd_path($media), @syslinux_boot_files;
- my $has_bootlogo = -e get_builddir($live) . $live->{prefix}{build}{boot} . '/syslinux/bootlogo';
+ my $has_bootlogo = $live->{system}{gfxboot} &&
+ -e get_builddir($live) . $live->{prefix}{build}{boot} . '/syslinux/bootlogo';
my $timeout = get_bootloader_timeout($live) * 10;
join("\n",
"default $live->{media}{title}",
@@ -638,7 +639,7 @@ sub build_grub_cfg {
my $grub_part = "(hd0" . (defined $part_nb ? "," . ($part_nb-1) : "") . ")";
join("\n",
"timeout " . get_bootloader_timeout($live),
- "gfxmenu $grub_part" . $live->{prefix}{media}{boot} . "/gfxmenu",
+ if_($live->{system}{gfxboot}, "gfxmenu $grub_part" . $live->{prefix}{media}{boot} . "/gfxmenu"),
"default 0",
(map {
my ($name, $cmdline) = @$_;