Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package combustion for openSUSE:Factory checked in at 2022-03-28 16:58:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/combustion (Old) and /work/SRC/openSUSE:Factory/.combustion.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "combustion" Mon Mar 28 16:58:37 2022 rev:14 rq:964654 version:0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/combustion/combustion.changes 2022-03-07 17:45:35.855143123 +0100 +++ /work/SRC/openSUSE:Factory/.combustion.new.1900/combustion.changes 2022-03-28 16:59:02.348845313 +0200 @@ -1,0 +2,19 @@ +Thu Mar 24 09:40:34 UTC 2022 - Fabian Vogt <fv...@suse.com> + +- Bump version to 0.3 +- Use the Wiki page as URL (boo#1195383) +- Don't touch /sysroot/etc/ after creating a new snapshot, it ends up + in the old snapshot's overlay + +------------------------------------------------------------------- +Wed Mar 23 15:15:15 UTC 2022 - Fabian Vogt <fv...@suse.com> + +- Disable ignition-mount.service's ExecStop instead of stopping the + unit (boo#1197309) + +------------------------------------------------------------------- +Mon Mar 21 13:20:39 UTC 2022 - Fabian Vogt <fv...@suse.com> + +- Be more --quiet with systemctl + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ combustion.spec ++++++ --- /var/tmp/diff_new_pack.GI3O07/_old 2022-03-28 16:59:02.900846063 +0200 +++ /var/tmp/diff_new_pack.GI3O07/_new 2022-03-28 16:59:02.904846068 +0200 @@ -17,12 +17,12 @@ Name: combustion -Version: 0.2 +Version: 0.3 Release: 0 Summary: System for initial configuration of appliances License: GPL-2.0-or-later Group: System/Management -URL: https://build.opensuse.org/package/show/home:Vogtinator:combustion/combustion +URL: https://en.opensuse.org/Portal:MicroOS/Combustion Source1: LICENSE Source2: README Source3: module-setup.sh ++++++ combustion ++++++ --- /var/tmp/diff_new_pack.GI3O07/_old 2022-03-28 16:59:02.972846161 +0200 +++ /var/tmp/diff_new_pack.GI3O07/_new 2022-03-28 16:59:02.976846166 +0200 @@ -92,21 +92,16 @@ # (https://github.com/systemd/systemd/issues/20329). To avoid that, # wait until systemd processed the umount events. In a chroot (or with # SYSTEMD_OFFLINE=1) systemctl always succeeds, so avoid an infinite loop. - if ! systemctl is-active does-not-exist.mount; then - while systemctl is-active sysroot.mount; do sleep 0.5; done + if ! systemctl --quiet is-active does-not-exist.mount; then + while systemctl --quiet is-active sysroot.mount; do sleep 0.5; done fi systemctl start sysroot.mount } +# Note: The /sysroot remounting during cleanup happens unconditionally. +# This is needed as ignition-mount.service's ExecStop is also disabled unconditionally. trap cleanup EXIT -# 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. Ignition is already done, so just stop it. -if systemctl --quiet is-active ignition-mount.service; then - systemctl stop ignition-mount.service -fi - if ! [ -d "${config_mount}/combustion" ]; then echo "No config found - doing nothing." exit 0 @@ -165,6 +160,8 @@ chmod a+x script ./script echo \$? > "${exchangedir}/retval" + # Snapshot got touched while the policy isn't active, needs relabeling again. + [ -e /etc/selinux/.relabelled ] && >> /etc/selinux/.autorelabel EOF echo "transactional-update failed" exit 1 @@ -175,9 +172,6 @@ chroot /sysroot transactional-update --no-selfupdate rollback exit 1 fi - - # Snapshot got touched while the policy isn't active, needs relabeling again. - [ -e /sysroot/etc/selinux/.relabelled ] && >> /sysroot/etc/selinux/.autorelabel else mount -o remount,rw /sysroot if ! chroot /sysroot sh -e -c "cd '${config_dir}'; chmod a+x script; ./script"; then ++++++ module-setup.sh ++++++ --- /var/tmp/diff_new_pack.GI3O07/_old 2022-03-28 16:59:03.052846269 +0200 +++ /var/tmp/diff_new_pack.GI3O07/_new 2022-03-28 16:59:03.056846274 +0200 @@ -11,6 +11,12 @@ inst_multiple awk chroot findmnt grep rmdir inst_simple "${moddir}/combustion" "/usr/bin/combustion" + # 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
