From 6a44b71a11e1423e2f24313a35d9867d56f8d035 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Tue, 15 Dec 2009 11:45:10 +0000
Subject: fix getting bootsplash theme (fixes gfxboot theme)

---
 draklive | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/draklive b/draklive
index 5d86cb2..94c231b 100755
--- a/draklive
+++ b/draklive
@@ -555,6 +555,17 @@ sub remove_unneeded_bootlogo_locales {
     return @kept_locales;
 }
 
+#- forked from bootsplash::themes_read_sysconfig
+sub get_bootsplash_theme() {
+    my $sysconfig_file = "/etc/sysconfig/bootsplash";
+    local $_;
+    my %theme;
+    foreach (cat_($::prefix . $sysconfig_file)) {
+        /^THEME=(.*)/ and $theme{name} = $1;
+    }
+    \%theme;
+}
+
 sub create_syslinux_msg_files {
     my ($live) = @_;
     my $syslinux_dir = $live->get_builddir . $live->{prefix}{build}{boot} . '/syslinux';
@@ -565,7 +576,7 @@ sub create_syslinux_msg_files {
 	require bootsplash;
 	my $theme = do {
             local $::prefix = $live->get_system_root;
-            bootsplash::themes_read_sysconfig('800x600');
+            get_bootsplash_theme();
 	};
 	print "copying $default_gfxboot_theme gfxboot theme\n";
 	cp_f(glob_($live->get_system_root . "/usr/share/gfxboot/themes/$default_gfxboot_theme/install/*"), $syslinux_dir);
-- 
cgit v1.2.1