summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2016-10-24 19:45:24 +0100
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2016-11-06 11:46:52 +0000
commitb8c31826370aae933f1943b12cfe7b043b3df8bb (patch)
treec51d4aa5dcf875a9a02f778b6c0bac888d630e26
parent843555e18822d50168bbd56d75db2e88f3d7ef3b (diff)
downloaddrakiso-b8c31826370aae933f1943b12cfe7b043b3df8bb.tar
drakiso-b8c31826370aae933f1943b12cfe7b043b3df8bb.tar.gz
drakiso-b8c31826370aae933f1943b12cfe7b043b3df8bb.tar.bz2
drakiso-b8c31826370aae933f1943b12cfe7b043b3df8bb.tar.xz
drakiso-b8c31826370aae933f1943b12cfe7b043b3df8bb.zip
draklive: replace incomplete syslinux/bootlogo with gfxboot
The generated bootlogo file is missing the background image and the translations. The generated gfxboot file contains the missing items. This replaces the manually applied hack found in draklive-config/files/hacks.
-rwxr-xr-xdraklive6
1 files changed, 4 insertions, 2 deletions
diff --git a/draklive b/draklive
index 5fc70aa..27710a8 100755
--- a/draklive
+++ b/draklive
@@ -81,8 +81,10 @@ sub build_syslinux_cfg {
my $boot = $live->get_media_prefix('boot', $opts->{boot});
my ($initrd, $kernel, $bootlogo, $help) = map { $to_root ? basename($_) : $_ }
map { $boot . $_ } $media->get_initrd_path, @syslinux_boot_files;
- my $has_bootlogo = $live->{system}{gfxboot} &&
- -e ($live->get_builddir . $live->{prefix}{build}{boot} . '/syslinux/bootlogo');
+ #- the generated syslinux/bootlogo is incomplete, so replace it
+ my $bootdir = $live->get_builddir . $live->{prefix}{build}{boot};
+ my $has_bootlogo = $live->{system}{gfxboot} && -e ($bootdir . '/gfxmenu');
+ cp_f($bootdir . '/gfxmenu', $bootdir . '/syslinux/bootlogo') if $has_bootlogo;
my $timeout = get_bootloader_timeout($live) * 10;
my $title = $media->{title} || $live->{media}{title};
join("\n",