Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package combustion for openSUSE:Factory
checked in at 2023-09-08 21:15:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/combustion (Old)
and /work/SRC/openSUSE:Factory/.combustion.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "combustion"
Fri Sep 8 21:15:13 2023 rev:21 rq:1109552 version:1.2+git5
Changes:
--------
--- /work/SRC/openSUSE:Factory/combustion/combustion.changes 2023-08-30
10:18:32.743999044 +0200
+++ /work/SRC/openSUSE:Factory/.combustion.new.1766/combustion.changes
2023-09-08 21:15:40.522758676 +0200
@@ -1,0 +2,8 @@
+Thu Sep 07 12:39:56 UTC 2023 - Fabian Vogt <fv...@suse.com>
+
+- Update to version 1.2+git5:
+ * Run combustion-prepare.service before ignition-enable-network.service
+ * Revert "Remove now obsolete workaround for ignition-mount.service ExecStop"
+ * Only attempt firstboot check on devices
+
+-------------------------------------------------------------------
Old:
----
combustion-1.2+git2.obscpio
New:
----
combustion-1.2+git5.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ combustion.spec ++++++
--- /var/tmp/diff_new_pack.P5H3K5/_old 2023-09-08 21:15:41.814804853 +0200
+++ /var/tmp/diff_new_pack.P5H3K5/_new 2023-09-08 21:15:41.814804853 +0200
@@ -17,7 +17,7 @@
Name: combustion
-Version: 1.2+git2
+Version: 1.2+git5
Release: 0
Summary: System for initial configuration of appliances
License: GPL-2.0-or-later
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.P5H3K5/_old 2023-09-08 21:15:41.858806425 +0200
+++ /var/tmp/diff_new_pack.P5H3K5/_new 2023-09-08 21:15:41.862806568 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/combustion.git</param>
- <param
name="changesrevision">09b719e283fe6505de11a5745cafec6681bb0c5a</param></service></servicedata>
+ <param
name="changesrevision">39e013ed1f916d347deae5fdd5eee2b86dbff437</param></service></servicedata>
(No newline at EOF)
++++++ combustion-1.2+git2.obscpio -> combustion-1.2+git5.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/combustion-1.2+git2/30firstboot/firstboot-detect
new/combustion-1.2+git5/30firstboot/firstboot-detect
--- old/combustion-1.2+git2/30firstboot/firstboot-detect 2023-08-22
17:56:39.000000000 +0200
+++ new/combustion-1.2+git5/30firstboot/firstboot-detect 2023-09-07
14:37:20.000000000 +0200
@@ -1,7 +1,15 @@
#!/bin/sh
set -eu
-what=$(systemctl show -P What sysroot.mount)
-opts=$(systemctl show -P Options sysroot.mount)
+what="$(systemctl show -P What sysroot.mount)"
+opts="$(systemctl show -P Options sysroot.mount)"
+
+# Catch cases where sysroot isn't a device,
+# especially kiwi's install:CDLABEL=INSTALL syntax.
+if ! echo "$what" | grep -q ^/; then
+ echo "Unable to detect firstboot on $what" >&2
+ exit 0
+fi
+
mount -o "$opts" "$what" /sysroot
# Handle x-initrd.mount without initrd-parse-etc.service
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/combustion-1.2+git2/combustion-prepare.service
new/combustion-1.2+git5/combustion-prepare.service
--- old/combustion-1.2+git2/combustion-prepare.service 2023-08-22
17:56:39.000000000 +0200
+++ new/combustion-1.2+git5/combustion-prepare.service 2023-09-07
14:37:20.000000000 +0200
@@ -11,6 +11,10 @@
# device
After=ignition-setup-user.service
+# This may enable network services in the same way, so make sure the prepare
+# script could write configiguration before networking is enabled.
+Before=ignition-enable-network.service
+
# This reconfigures networking, which runs during the initqueue (wicked)
# or has its own service (NM)
Before=dracut-initqueue.service nm-initrd.service
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/combustion-1.2+git2/module-setup.sh
new/combustion-1.2+git5/module-setup.sh
--- old/combustion-1.2+git2/module-setup.sh 2023-08-22 17:56:39.000000000
+0200
+++ new/combustion-1.2+git5/module-setup.sh 2023-09-07 14:37:20.000000000
+0200
@@ -22,6 +22,12 @@
mkdir -p "${initdir}/etc/modprobe.d"
echo "options dasd_mod dasd=autodetect" >
"${initdir}/etc/modprobe.d/dasd-autodetect.conf"
+ # ignition-mount.service mounts stuff below /sysroot in ExecStart and
umounts
+ # it on ExecStop, failing if umounting fails. This conflicts with the
+ # mounts/umounts done by combustion. Just let combustion do it instead.
+ mkdir -p "${initdir}/${systemdsystemunitdir}/ignition-mount.service.d/"
+ echo -e "[Service]\nExecStop=" >
"${initdir}/${systemdsystemunitdir}/ignition-mount.service.d/noexecstop.conf"
+
# Wait up to 10s (30s on aarch64) for the config drive
devtimeout=10
[ "$(uname -m)" = "aarch64" ] && devtimeout=30
++++++ combustion.obsinfo ++++++
--- /var/tmp/diff_new_pack.P5H3K5/_old 2023-09-08 21:15:41.966810285 +0200
+++ /var/tmp/diff_new_pack.P5H3K5/_new 2023-09-08 21:15:41.970810428 +0200
@@ -1,5 +1,5 @@
name: combustion
-version: 1.2+git2
-mtime: 1692719799
-commit: 09b719e283fe6505de11a5745cafec6681bb0c5a
+version: 1.2+git5
+mtime: 1694090240
+commit: 39e013ed1f916d347deae5fdd5eee2b86dbff437
