[Merge] ~enr0n/ubuntu/+source/systemd:ubuntu-jammy-sru into ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-jammy

[Nick Rosbrook]

Thanks for your review! I will review the email before proceeding.

Diff comments:

> diff --git a/debian/systemd.postinst b/debian/systemd.postinst
> index d6799d0..73c529c 100644
> --- a/debian/systemd.postinst
> +++ b/debian/systemd.postinst
> @@ -87,7 +87,22 @@ fi
>  
>  # skip daemon-reexec and try-restarts during shutdown to avoid hitting LP: #1803391
>  if [ -n "$2" ] && [ "$(systemctl is-system-running)" != "stopping" ]; then
> -    _systemctl daemon-reexec || true

This is the commit that moved this block after #DEBHELPER#: https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=2acb27dcf9b131aa7110916746d18c8c8fe55108.

Looking at the resulting systemd.postint, I don't have any concerns about the new change, because the generated code does not affect daemon-reexec:

# Automatically added by dh_installtmpfiles/13.6ubuntu1
if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-deconfigure" ] || [ "$1" = "abort-remove" ] ; then
        # In case this system is running systemd, we need to ensure that all
        # necessary tmpfiles (if any) are created before starting.
        if [ -z "${DPKG_ROOT:-}" ] && [ -d /run/systemd/system ] ; then
                systemd-tmpfiles --create debian.conf home.conf journal-nocow.conf legacy.conf systemd-nologin.conf systemd-pstore.conf systemd-tmp.conf systemd.conf tmp.conf var.conf x11.conf >/dev/null || true
        fi
fi
# End automatically added section
# Automatically added by dh_installdeb/13.6ubuntu1
dpkg-maintscript-helper rm_conffile /etc/dhcp/dhclient-exit-hooks.d/timesyncd 245.4-2\~ -- "$@"
dpkg-maintscript-helper rm_conffile /etc/systemd/timesyncd.conf 245.4-2\~ -- "$@"
dpkg-maintscript-helper rm_conffile /etc/dhcp/dhclient-enter-hooks.d/resolved 246-2ubuntu1\~ -- "$@"
dpkg-maintscript-helper rm_conffile /etc/pam.d/systemd-user 246.6-3\~ -- "$@"
# End automatically added section

> +    # LP: #2013543 - the systemd cmdline can get mangled depending on the
> +    # contents of /proc/cmdline, which causes systemd to fail to deserialize
> +    # it's previous state on daemon-reexec. This means that for upgrades from
> +    # affected versions, we need a reboot and cannot re-exec here, else the
> +    # bug could be triggered.
> +    if dpkg --compare-versions "$2" lt "249.11-0ubuntu3.10~"; then
> +        if ! grep -Fqsx systemd /run/reboot-required.pkgs; then
> +            echo systemd >> /run/reboot-required.pkgs || true
> +        fi
> +
> +        # Reload to avoid warnings when restarting services below
> +        _systemctl daemon-reload || true
> +    else
> +        _systemctl daemon-reexec || true
> +    fi
> +
>      # don't restart logind; this can be done again once this gets implemented:
>      # https://github.com/systemd/systemd/issues/1163
>      if dpkg --compare-versions "$2" lt-nl "246.2-2~"; then


-- 
https://code.launchpad.net/~enr0n/ubuntu/+source/systemd/+git/systemd/+merge/449220
Your team Ubuntu Core Development Team is subscribed to branch ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-jammy.