diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi index e1b3489..278fe80 100644 --- a/livecd-leap-gnome.kiwi +++ b/livecd-leap-gnome.kiwi @@ -540,8 +540,8 @@ - - + + diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi index b1de243..ff1c788 100644 --- a/livecd-leap-kde.kiwi +++ b/livecd-leap-kde.kiwi @@ -500,8 +500,8 @@ - - + + diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi index 1562ad0..e030315 100644 --- a/livecd-leap-x11.kiwi +++ b/livecd-leap-x11.kiwi @@ -544,8 +544,8 @@ - - + + diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes index 0b57d9a..8034513 100644 --- a/livecd-openSUSE.changes +++ b/livecd-openSUSE.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 23 13:39:39 UTC 2019 - Fabian Vogt + +- It's Leap-release on Leap now for some reason + ------------------------------------------------------------------- Tue Oct 22 08:40:15 UTC 2019 - Fabian Vogt diff --git a/livecd.kiwi.in b/livecd.kiwi.in index 7e35686..2c52559 100644 --- a/livecd.kiwi.in +++ b/livecd.kiwi.in @@ -59,8 +59,8 @@ - - + + diff --git a/pre-checkin.sh b/pre-checkin.sh index d4ca639..0a681a6 100644 --- a/pre-checkin.sh +++ b/pre-checkin.sh @@ -33,9 +33,11 @@ archive() { for distro in leap tumbleweed; do distroname="openSUSE Tumbleweed" bootsplash="bgrt" + releaseprefix="openSUSE" if [ "${distro}" = "leap" ]; then distroname="openSUSE Leap %OS_VERSION_ID%" bootsplash="openSUSE" + releaseprefix="Leap" fi for flavor in gnome kde xfce x11; do @@ -58,6 +60,7 @@ for distro in leap tumbleweed; do s#@DISPLAYNAME@#${name}#g;\ s#@VOLID@#${name// /_}#g;\ s#@BOOTSPLASH@#${bootsplash}#g;\ + s#@RELEASEPREFIX@#${releaseprefix}#g;\ s#@PACKAGES@#${PACKAGES}#g;" livecd.kiwi.in > livecd-${distro}-${flavor}.kiwi done done