Fabian Vogt 2019-08-16 06:58:45 +00:00 committed by Git OBS Bridge
parent 3fba4dde18
commit 9dd2101925
6 changed files with 16 additions and 8 deletions

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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