diff --git a/config.sh b/config.sh
index 89dcf87..f36478e 100644
--- a/config.sh
+++ b/config.sh
@@ -154,7 +154,7 @@ baseUpdateSysConfig /etc/sysconfig/displaymanager DISPLAYMANAGER $displaymanager
# boo#1039756
[ "$desktop" = "gnome" ] && baseUpdateSysConfig /etc/sysconfig/windowmanager DEFAULT_WM gnome
-#Disable journal write to disk in live mode, bug 950999
+# Disable journal write to disk in live mode, bug 950999
echo "Storage=volatile" >> /etc/systemd/journald.conf
# Remove generated files (boo#1098535)
@@ -163,7 +163,6 @@ rm -rf /var/cache/zypp/* /var/lib/zypp/AnonymousUniqueId /var/lib/systemd/random
# Remove netronome firmware (part of kernel-firmware): this sums up to 125MB
rm -rf /lib/firmware/netronome/
-
cat >/etc/systemd/system/fixupbootloader.service <
+
+
+
+
@@ -313,6 +317,8 @@
+
+
@@ -467,8 +473,6 @@
-
-
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index 7a5901b..207f40e 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -296,6 +296,10 @@
+
+
+
+
@@ -313,6 +317,8 @@
+
+
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index ba4c11d..38de878 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -296,6 +296,10 @@
+
+
+
+
@@ -313,6 +317,8 @@
+
+
@@ -488,8 +494,6 @@
-
-
@@ -518,6 +522,8 @@
+
+
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 65c6709..a666e71 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Wed Nov 4 08:17:48 UTC 2020 - Dominique Leuenberger
+
+- Block systemd-doc and man-pages 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.
+
+-------------------------------------------------------------------
+Wed Oct 14 08:36:12 UTC 2020 - Fabian Vogt
+
+- Drop set -e, it breaks when there's a conditional experssion as
+ last statement in a file
+- Use vim-small for non-Rescue as well
+
-------------------------------------------------------------------
Mon Sep 7 09:07:51 UTC 2020 - Fabian Vogt
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index db62dcf..923c08e 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -296,6 +296,10 @@
+
+
+
+
@@ -313,6 +317,11 @@
+
+
+
+
+
@@ -458,8 +467,6 @@
-
-
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index 0b5cb22..368f7bb 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -296,6 +296,10 @@
+
+
+
+
@@ -313,6 +317,11 @@
+
+
+
+
+
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index 7bc4fd8..305b7dc 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -296,6 +296,10 @@
+
+
+
+
@@ -313,6 +317,11 @@
+
+
+
+
+
@@ -479,11 +488,6 @@
-
-
-
-
-
@@ -512,6 +516,8 @@
+
+
diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index 7143fb5..dfcc640 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/livecd-tumbleweed-xfce.kiwi
@@ -296,6 +296,10 @@
+
+
+
+
@@ -313,6 +317,11 @@
+
+
+
+
+
@@ -437,6 +446,8 @@
+
+
diff --git a/pre-checkin.sh b/pre-checkin.sh
index 2ec61ad..45c2c6d 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,20 +42,20 @@ 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"
else
name="${distroname} ${uppercaseflavor} Live"
fi
-
+
PACKAGES="\n "
. "$PWD/list-common.sh"
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;\