Hello community, here is the log from the commit of package combustion for openSUSE:Factory checked in at 2020-10-07 14:17:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/combustion (Old) and /work/SRC/openSUSE:Factory/.combustion.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "combustion" Wed Oct 7 14:17:40 2020 rev:5 rq:839821 version:0.2 Changes: -------- --- /work/SRC/openSUSE:Factory/combustion/combustion.changes 2020-09-21 17:26:58.224116730 +0200 +++ /work/SRC/openSUSE:Factory/.combustion.new.4249/combustion.changes 2020-10-07 14:17:41.809448007 +0200 @@ -1,0 +2,12 @@ +Tue Oct 6 10:19:57 UTC 2020 - Fabian Vogt <[email protected]> + +- Implement support for systems without transactional-update +- Require rmdir explicitly + +------------------------------------------------------------------- +Mon Oct 5 08:33:19 UTC 2020 - Fabian Vogt <[email protected]> + +- Fail properly when the retval file doesn't exist +- Stop ignition-mount.service to avoid conflict (boo#1176746) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ combustion ++++++ --- /var/tmp/diff_new_pack.nO1U90/_old 2020-10-07 14:17:42.505448561 +0200 +++ /var/tmp/diff_new_pack.nO1U90/_new 2020-10-07 14:17:42.505448561 +0200 @@ -89,6 +89,13 @@ exit 0 fi +# 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 + # Copy config mkdir "${exchangedir}" config_dir="${exchangedir}/config" @@ -125,20 +132,29 @@ fi fi -# t-u doesn't allow running arbitrary commands and -# also ignores the shell's exit code, so DIY. -if ! chroot /sysroot transactional-update shell <<EOF; then - cd "${config_dir}" - chmod a+x script - ./script - echo \$? > "${exchangedir}/retval" +if [ -x /sysroot/usr/sbin/transactional-update ]; then + # t-u doesn't allow running arbitrary commands and + # also ignores the shell's exit code, so DIY. + if ! chroot /sysroot transactional-update shell <<EOF; then + cd "${config_dir}" + chmod a+x script + ./script + echo \$? > "${exchangedir}/retval" EOF - echo "transactional-update failed" - exit 1 -fi + echo "transactional-update failed" + exit 1 + fi -if [ "$(cat "${exchangedir}/retval")" -ne 0 ]; then - echo "Command failed, rolling back" - chroot /sysroot transactional-update --no-selfupdate rollback - exit 1 + if ! [ -e "${exchangedir}/retval" ] || [ "$(cat "${exchangedir}/retval")" -ne 0 ]; then + echo "Command failed, rolling back" + chroot /sysroot transactional-update --no-selfupdate rollback + exit 1 + fi +else + mount -o remount,rw /sysroot + if ! chroot /sysroot sh -e -c "cd '${config_dir}'; chmod a+x script; ./script"; then + echo "Command failed" + exit 1 + fi + chroot /sysroot snapper --no-dbus create -d "After combustion configuration" || : fi ++++++ module-setup.sh ++++++ --- /var/tmp/diff_new_pack.nO1U90/_old 2020-10-07 14:17:42.565448609 +0200 +++ /var/tmp/diff_new_pack.nO1U90/_new 2020-10-07 14:17:42.565448609 +0200 @@ -8,7 +8,7 @@ inst_simple "${moddir}/combustion.rules" "/etc/udev/rules.d/70-combustion.rules" mkdir -p "${initdir}/${systemdsystemunitdir}/initrd.target.requires/" ln_r "../combustion.service" "${systemdsystemunitdir}/initrd.target.requires/combustion.service" - inst_multiple awk chroot findmnt + inst_multiple awk chroot findmnt rmdir inst_simple "${moddir}/combustion" "/usr/bin/combustion" # Wait up to 10s (30s on aarch64) for the config drive
