diff --git a/list-common.sh b/list-common.sh
index 086952b..4c15563 100644
--- a/list-common.sh
+++ b/list-common.sh
@@ -164,6 +164,7 @@ buildignore yast2-sudo
# systemd-coredump makes no sense on a live image: there are no debuginfo installed
buildignore systemd-coredump
+buildignore systemd-doc
# VPNC is no longer
buildignore NetworkManager-vpnc-gnome
diff --git a/list-xfce.sh b/list-xfce.sh
index ab7719a..94e8500 100644
--- a/list-xfce.sh
+++ b/list-xfce.sh
@@ -24,7 +24,6 @@ install libxslt-tools
# Remove useless xfce panel plugins
buildignore xfce4-panel-plugin-xkb
buildignore xfce4-panel-plugin-notes
-buildignore systemd-doc
buildignore engrampa-lang
# Remove Libreoffice as it's too big
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index 5714dc2..c3e582e 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -296,6 +296,8 @@
+
+
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index 7a5901b..89a1eb1 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -296,6 +296,8 @@
+
+
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index ba4c11d..8ecb23f 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -296,6 +296,8 @@
+
+
@@ -518,6 +520,8 @@
+
+
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 65c6709..b03a672 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed Nov 4 08:17:48 UTC 2020 - Dominique Leuenberger
+
+- Block systemd-doc from all flavors, not only xfce.
+
+-------------------------------------------------------------------
+Fri Oct 30 10:10:31 UTC 2020 - Dominique Leuenberger
+
+- Do only use set -u: set -e causes issues with stepping out of the
+ for loop using continue.
+- Skip the for loop early: no reason to calculate the PACKAGES list
+ and then not consume it.
+- Use tr [:lower:] [:upper:] instead of tr a-z A-Z.
+
-------------------------------------------------------------------
Mon Sep 7 09:07:51 UTC 2020 - Fabian Vogt
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index db62dcf..774d7a1 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -296,6 +296,8 @@
+
+
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index 0b5cb22..dd32baf 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -296,6 +296,8 @@
+
+
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index 0abd1b5..2c6a91e 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -69,8 +69,6 @@
-
-
@@ -298,6 +296,8 @@
+
+
@@ -514,6 +514,8 @@
+
+
diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index e7762c1..5333026 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/livecd-tumbleweed-xfce.kiwi
@@ -298,8 +298,6 @@
-
-
@@ -441,6 +439,8 @@
+
+
diff --git a/pre-checkin.sh b/pre-checkin.sh
index 2ec61ad..cc02330 100644
--- a/pre-checkin.sh
+++ b/pre-checkin.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-set -eu
+set -u
install() {
if [ -n "${2-}" ]; then
@@ -42,7 +42,8 @@ for distro in leap tumbleweed; do
fi
for flavor in gnome kde xfce x11; do
- uppercaseflavor="$(echo "${flavor}" | tr a-z A-Z)"
+ [ "${flavor}" = "xfce" -a "${distro}" = "leap" ] && continue # Prevent creation of livecd-leap-xfce.kiwi
+ uppercaseflavor="$(echo "${flavor}" | tr [:lower:] [:upper:])"
if [ "${flavor}" = "x11" ]; then
name="${distroname} Rescue CD"
@@ -55,7 +56,6 @@ for distro in leap tumbleweed; do
PACKAGES="$PACKAGES\n\n "
. "$PWD/list-${flavor}.sh"
- [ "${flavor}" = "xfce" -a "${distro}" = "leap" ] && continue # Prevent creation of livecd-leap-xfce.kiwi
sed "s#@FLAVOR@#${flavor}#g;\
s#@NAME@#${name// /-}#g;\
s#@DISPLAYNAME@#${name}#g;\