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-10-18 21:25:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/combustion (Old)
and /work/SRC/openSUSE:Factory/.combustion.new.31755 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "combustion"
Wed Oct 18 21:25:14 2023 rev:25 rq:1118463 version:1.2+git9
Changes:
--------
--- /work/SRC/openSUSE:Factory/combustion/combustion.changes 2023-10-13
23:13:37.592742152 +0200
+++ /work/SRC/openSUSE:Factory/.combustion.new.31755/combustion.changes
2023-10-18 21:25:19.267855884 +0200
@@ -1,0 +2,6 @@
+Wed Oct 18 06:14:38 UTC 2023 - Fabian Vogt <fv...@suse.com>
+
+- Update to version 1.2+git9:
+ * Override subvol= with the new snapshot if necessary
+
+-------------------------------------------------------------------
Old:
----
combustion-1.2+git8.obscpio
New:
----
combustion-1.2+git9.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ combustion.spec ++++++
--- /var/tmp/diff_new_pack.hee5Fe/_old 2023-10-18 21:25:20.083885444 +0200
+++ /var/tmp/diff_new_pack.hee5Fe/_new 2023-10-18 21:25:20.083885444 +0200
@@ -17,7 +17,7 @@
Name: combustion
-Version: 1.2+git8
+Version: 1.2+git9
Release: 0
Summary: System for initial configuration of appliances
License: GPL-2.0-or-later
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.hee5Fe/_old 2023-10-18 21:25:20.127887038 +0200
+++ /var/tmp/diff_new_pack.hee5Fe/_new 2023-10-18 21:25:20.131887183 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/combustion.git</param>
- <param
name="changesrevision">e251a76c725bb57aefa78dcfb0cca442ef4b6049</param></service></servicedata>
+ <param
name="changesrevision">9771c4b4bca1af398037aa063dbee6f4b608f826</param></service></servicedata>
(No newline at EOF)
++++++ combustion-1.2+git8.obscpio -> combustion-1.2+git9.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/combustion-1.2+git8/combustion
new/combustion-1.2+git9/combustion
--- old/combustion-1.2+git8/combustion 2023-10-12 11:35:18.000000000 +0200
+++ new/combustion-1.2+git9/combustion 2023-10-18 08:13:55.000000000 +0200
@@ -218,6 +218,24 @@
chroot /sysroot transactional-update --no-selfupdate rollback
exit 1
fi
+
+ # If the mount options for /sysroot include subvol(id)=...,
+ # it would mount the old snapshot again. Override it.
+ # At this point, /sysroot is mounted so systemctl show returns the
active mount options,
+ # not the configured ones. Use cat to get the configured ones instead.
+ if systemctl cat sysroot.mount | grep -q '\<subvol\(id\)\?='; then
+ # systemctl cat can't query a specific property, so work with
the active options instead here...
+ rootopts="$(systemctl show -P Options sysroot.mount | sed -Ee
's/(^|,)subvol=[^,]*(,|$)//g;s/(^|,)subvolid=[^,]*(,|$)//g')"
+ # Apparently there is no better API?
+ newdefault=$(btrfs subvolume get-default /sysroot | sed -e
's/^.* path \([^[:space:]]*\).*$/\1/')
+ # Drop-ins in /etc have precedence over generated files in /run.
+ mkdir -p /etc/systemd/system/sysroot.mount.d/
+ cat >
/etc/systemd/system/sysroot.mount.d/combustion-newsubvol.conf <<-EOF
+ [Mount]
+ Options=${rootopts},subvol=${newdefault}
+ EOF
+ systemctl daemon-reload # Unfortunately required for this :-/
+ fi
else
mount -o remount,rw /sysroot
if ! chroot /sysroot sh -e -c "cd '${config_dir}'; chmod a+x script;
./script"; then
++++++ combustion.obsinfo ++++++
--- /var/tmp/diff_new_pack.hee5Fe/_old 2023-10-18 21:25:20.239891096 +0200
+++ /var/tmp/diff_new_pack.hee5Fe/_new 2023-10-18 21:25:20.243891241 +0200
@@ -1,5 +1,5 @@
name: combustion
-version: 1.2+git8
-mtime: 1697103318
-commit: e251a76c725bb57aefa78dcfb0cca442ef4b6049
+version: 1.2+git9
+mtime: 1697609635
+commit: 9771c4b4bca1af398037aa063dbee6f4b608f826
