From 9dd2101925eb43bf34013926189dbe56e391862a7da9dab70a3f0e246ca46521 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Fri, 16 Aug 2019 06:58:45 +0000
Subject: [PATCH] - Use "openSUSE" bootsplash for leap

OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=40
---
 livecd-leap-gnome.kiwi  | 4 ++--
 livecd-leap-kde.kiwi    | 4 ++--
 livecd-leap-x11.kiwi    | 4 ++--
 livecd-openSUSE.changes | 5 +++++
 livecd.kiwi.in          | 4 ++--
 pre-checkin.sh          | 3 +++
 6 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index 45cd3e5..8d64765 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -16,7 +16,7 @@
     <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_%OS_VERSION_ID%_GNOME_Live" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>bgrt</bootsplash-theme>
+    <bootsplash-theme>openSUSE</bootsplash-theme>
     <packagemanager>zypper</packagemanager>
     <rpm-check-signatures>false</rpm-check-signatures>
     <locale>en_US</locale>
@@ -26,7 +26,7 @@
     <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_%OS_VERSION_ID%_GNOME_Live" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>bgrt</bootsplash-theme>
+    <bootsplash-theme>openSUSE</bootsplash-theme>
     <packagemanager>zypper</packagemanager>
     <rpm-check-signatures>false</rpm-check-signatures>
     <locale>en_US</locale>
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index c86e0d6..73fff7a 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -16,7 +16,7 @@
     <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_%OS_VERSION_ID%_KDE_Live" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>bgrt</bootsplash-theme>
+    <bootsplash-theme>openSUSE</bootsplash-theme>
     <packagemanager>zypper</packagemanager>
     <rpm-check-signatures>false</rpm-check-signatures>
     <locale>en_US</locale>
@@ -26,7 +26,7 @@
     <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_%OS_VERSION_ID%_KDE_Live" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>bgrt</bootsplash-theme>
+    <bootsplash-theme>openSUSE</bootsplash-theme>
     <packagemanager>zypper</packagemanager>
     <rpm-check-signatures>false</rpm-check-signatures>
     <locale>en_US</locale>
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index 24a4606..af2e822 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -16,7 +16,7 @@
     <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="openSUSE_Leap_%OS_VERSION_ID%_Rescue_CD" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>bgrt</bootsplash-theme>
+    <bootsplash-theme>openSUSE</bootsplash-theme>
     <packagemanager>zypper</packagemanager>
     <rpm-check-signatures>false</rpm-check-signatures>
     <locale>en_US</locale>
@@ -26,7 +26,7 @@
     <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="openSUSE_Leap_%OS_VERSION_ID%_Rescue_CD" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>bgrt</bootsplash-theme>
+    <bootsplash-theme>openSUSE</bootsplash-theme>
     <packagemanager>zypper</packagemanager>
     <rpm-check-signatures>false</rpm-check-signatures>
     <locale>en_US</locale>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 57ac92c..6565ebb 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Aug 16 06:58:23 UTC 2019 - Fabian Vogt <fvogt@suse.com>
+
+- Use "openSUSE" bootsplash for leap
+
 -------------------------------------------------------------------
 Thu Aug 15 09:22:47 UTC 2019 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/livecd.kiwi.in b/livecd.kiwi.in
index 1725f1d..7e35686 100644
--- a/livecd.kiwi.in
+++ b/livecd.kiwi.in
@@ -16,7 +16,7 @@
     <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="uefi" volid="@VOLID@" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>bgrt</bootsplash-theme>
+    <bootsplash-theme>@BOOTSPLASH@</bootsplash-theme>
     <packagemanager>zypper</packagemanager>
     <rpm-check-signatures>false</rpm-check-signatures>
     <locale>en_US</locale>
@@ -26,7 +26,7 @@
     <type primary="true" bootprofile="default" kernelcmdline="splash=silent quiet" flags="overlay" hybrid="true" hybridpersistent="true" hybridpersistent_filesystem="ext4" image="iso" firmware="bios" volid="@VOLID@" mediacheck="true"/>
     <version>2.8.0</version>
     <bootloader-theme>openSUSE</bootloader-theme>
-    <bootsplash-theme>bgrt</bootsplash-theme>
+    <bootsplash-theme>@BOOTSPLASH@</bootsplash-theme>
     <packagemanager>zypper</packagemanager>
     <rpm-check-signatures>false</rpm-check-signatures>
     <locale>en_US</locale>
diff --git a/pre-checkin.sh b/pre-checkin.sh
index 4bfe90a..d4ca639 100644
--- a/pre-checkin.sh
+++ b/pre-checkin.sh
@@ -32,8 +32,10 @@ archive() {
 
 for distro in leap tumbleweed; do
 	distroname="openSUSE Tumbleweed"
+	bootsplash="bgrt"
 	if [ "${distro}" = "leap" ]; then
 		distroname="openSUSE Leap %OS_VERSION_ID%"
+		bootsplash="openSUSE"
 	fi
 
 	for flavor in gnome kde xfce x11; do
@@ -55,6 +57,7 @@ for distro in leap tumbleweed; do
 		     s#@NAME@#${name// /-}#g;\
 		     s#@DISPLAYNAME@#${name}#g;\
 		     s#@VOLID@#${name// /_}#g;\
+		     s#@BOOTSPLASH@#${bootsplash}#g;\
 		     s#@PACKAGES@#${PACKAGES}#g;" livecd.kiwi.in > livecd-${distro}-${flavor}.kiwi      
 	done
 done