Hello community,
here is the log from the commit of package livecd-openSUSE for openSUSE:Factory
checked in at 2019-12-21 12:30:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/livecd-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.livecd-openSUSE.new.6675 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "livecd-openSUSE"
Sat Dec 21 12:30:57 2019 rev:83 rq:758258 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/livecd-openSUSE/livecd-openSUSE.changes
2019-11-11 13:01:31.725762652 +0100
+++
/work/SRC/openSUSE:Factory/.livecd-openSUSE.new.6675/livecd-openSUSE.changes
2019-12-21 12:31:22.431363022 +0100
@@ -1,0 +2,5 @@
+Thu Dec 19 15:14:46 UTC 2019 - Fabian Vogt <[email protected]>
+
+- Add hack to remove LOADER_TYPE to fix upgrading (boo#1155545)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
livecd-leap-kde.kiwi: same change
livecd-leap-x11.kiwi: same change
livecd-openSUSE.kiwi: same change
livecd-tumbleweed-gnome.kiwi: same change
livecd-tumbleweed-kde.kiwi: same change
livecd-tumbleweed-x11.kiwi: same change
livecd-tumbleweed-xfce.kiwi: same change
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.7Pq2IF/_old 2019-12-21 12:31:23.171363374 +0100
+++ /var/tmp/diff_new_pack.7Pq2IF/_new 2019-12-21 12:31:23.171363374 +0100
@@ -43,7 +43,7 @@
systemctl -f disable $i
done
-echo '# multipath needs to be excluded from dracut as it breaks os-proper' >
/etc/dracut.conf.d/no-multipath.conf
+echo '# multipath needs to be excluded from dracut as it breaks os-prober' >
/etc/dracut.conf.d/no-multipath.conf
echo 'omit_dracutmodules+=" multipath "' >>
/etc/dracut.conf.d/no-multipath.conf
cd /
@@ -158,3 +158,21 @@
# Remove netronome firmware (part of kernel-firmware): this sums up to 125MB
rm -rf /lib/firmware/netronome/
+
+
+cat >/etc/systemd/system/fixupbootloader.service <<EOF
+# boo#1155545 - LOADER_TYPE has to be nil for the upgrade to work properly.
+# Kiwi does not allow changing the file directly, so do it in this ugly way.
+[Unit]
+Description=Remove LOADER_TYPE from /etc/sysconfig/bootloader
+Before=systemd-user-sessions.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/gawk -i inplace '!/^LOADER_TYPE=/' /etc/sysconfig/bootloader
+
+[Install]
+WantedBy=multi-user.target
+EOF
+
+systemctl -f enable fixupbootloader.service
