Merge ~enr0n/ubuntu/+source/systemd:ubuntu-kinetic into ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-kinetic

Proposed by Nick Rosbrook
Status: Merged
Merged at revision: fb5fdc89d8514683e3c46b6e5267dce869495808
Proposed branch: ~enr0n/ubuntu/+source/systemd:ubuntu-kinetic
Merge into: ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-kinetic
Diff against target: 7594 lines (+2925/-689)
205 files modified
.gitignore (+1/-0)
debian/changelog (+190/-5)
debian/control (+110/-9)
debian/extra/initramfs/post-update.d/systemd-boot (+11/-0)
debian/extra/kernel/postinst.d/systemd-boot (+11/-0)
debian/extra/kernel/postrm.d/systemd-boot (+11/-0)
debian/extra/pam-configs/systemd-homed (+15/-0)
debian/gitlab-ci.yml (+2/-0)
debian/libnss-myhostname.install (+0/-2)
debian/libnss-myhostname.manpages (+2/-0)
debian/libnss-myhostname.nss (+1/-0)
debian/libnss-mymachines.install (+0/-2)
debian/libnss-mymachines.manpages (+2/-0)
debian/libnss-mymachines.nss (+1/-0)
debian/libnss-resolve.install (+0/-2)
debian/libnss-resolve.lintian-overrides (+0/-1)
debian/libnss-resolve.manpages (+2/-0)
debian/libnss-resolve.nss (+1/-0)
debian/libnss-systemd.install (+0/-2)
debian/libnss-systemd.manpages (+2/-0)
debian/libnss-systemd.nss (+4/-0)
debian/libpam-systemd.install (+1/-2)
debian/libpam-systemd.manpages (+1/-0)
debian/libsystemd-dev.install (+0/-2)
debian/libsystemd-dev.manpages (+2/-0)
debian/libsystemd-shared.install (+2/-0)
debian/libsystemd-shared.lintian-overrides (+2/-0)
debian/libudev-dev.install (+0/-2)
debian/libudev-dev.manpages (+2/-0)
debian/patches/Move-homectl-and-userdbctl-to-bindir.patch (+35/-0)
debian/patches/debian/Downgrade-a-couple-of-warnings-to-debug.patch (+4/-4)
debian/patches/debian/Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-back-to-.patch (+4/-4)
debian/patches/debian/Revert-core-set-RLIMIT_CORE-to-unlimited-by-default.patch (+2/-2)
debian/patches/debian/Use-Debian-specific-config-files.patch (+2/-2)
debian/patches/debian/fsckd-daemon-for-inter-fsckd-communication.patch (+3/-3)
debian/patches/meson-install-libsystemd-shared-into-rootpkglibdir.patch (+1218/-0)
debian/patches/series (+4/-5)
debian/patches/shellcheck-clean-kernel-install-again.patch (+46/-0)
debian/patches/test-denylist-TEST-29-PORTABLE-again.patch (+18/-0)
debian/rules (+54/-38)
debian/shlibs.local.in (+2/-2)
debian/systemd-boot-efi.install (+1/-0)
debian/systemd-boot-efi.lintian-overrides (+6/-0)
debian/systemd-boot-efi.manpages (+1/-0)
debian/systemd-boot.install (+10/-0)
debian/systemd-boot.lintian-overrides (+3/-0)
debian/systemd-boot.manpages (+8/-0)
debian/systemd-container.install (+0/-6)
debian/systemd-container.manpages (+6/-0)
debian/systemd-coredump.install (+0/-3)
debian/systemd-coredump.manpages (+3/-0)
debian/systemd-homed.install (+11/-0)
debian/systemd-homed.lintian-overrides (+5/-0)
debian/systemd-homed.manpages (+1/-0)
debian/systemd-homed.postinst (+7/-0)
debian/systemd-homed.prerm (+20/-0)
debian/systemd-journal-remote.install (+0/-12)
debian/systemd-journal-remote.manpages (+12/-0)
debian/systemd-oomd.install (+0/-1)
debian/systemd-oomd.manpages (+1/-0)
debian/systemd-resolved.install (+13/-0)
debian/systemd-resolved.links (+1/-0)
debian/systemd-resolved.lintian-overrides (+3/-0)
debian/systemd-resolved.manpages (+4/-0)
debian/systemd-resolved.postinst (+28/-0)
debian/systemd-standalone-sysusers.manpages (+1/-0)
debian/systemd-standalone-tmpfiles.manpages (+1/-0)
debian/systemd-sysv.install (+0/-7)
debian/systemd-sysv.manpages (+7/-0)
debian/systemd-timesyncd.install (+0/-1)
debian/systemd-timesyncd.manpages (+1/-0)
debian/systemd-userdbd.install (+5/-0)
debian/systemd-userdbd.lintian-overrides (+3/-0)
debian/systemd-userdbd.manpages (+1/-0)
debian/systemd.NEWS (+21/-0)
debian/systemd.install (+0/-5)
debian/systemd.lintian-overrides (+0/-7)
debian/systemd.maintscript (+1/-0)
debian/systemd.manpages (+4/-0)
debian/systemd.postinst (+1/-4)
debian/tests/control (+4/-0)
debian/udev.install (+0/-7)
debian/udev.manpages (+7/-0)
dev/null (+0/-33)
hwdb.d/70-analyzers.hwdb (+0/-1)
man/journalctl.xml (+1/-1)
man/os-release.xml (+1/-1)
man/pam_systemd_home.xml (+14/-5)
man/sd_notify.xml (+9/-8)
man/system-or-user-ns.xml (+2/-2)
man/systemctl.xml (+41/-40)
man/systemd-creds.xml (+1/-1)
man/systemd-integritysetup-generator.xml (+1/-1)
man/systemd-sysctl.service.xml (+1/-1)
man/systemd.exec.xml (+34/-12)
man/systemd.mount.xml (+7/-9)
man/systemd.netdev.xml (+1/-1)
man/systemd.network.xml (+6/-6)
man/sysupdate.d.xml (+10/-10)
man/udevadm.xml (+2/-1)
meson.build (+15/-2)
src/analyze/analyze-security.c (+22/-17)
src/basic/fd-util.c (+2/-0)
src/basic/gcrypt-util.c (+2/-0)
src/basic/hashmap.c (+8/-5)
src/basic/missing_fs.h (+5/-0)
src/basic/set.h (+6/-3)
src/basic/stat-util.c (+6/-14)
src/basic/stat-util.h (+7/-2)
src/basic/time-util.c (+1/-1)
src/basic/unit-file.c (+1/-4)
src/basic/virt.c (+12/-7)
src/boot/efi/meson.build (+13/-0)
src/boot/efi/xbootldr.c (+1/-1)
src/cgroups-agent/cgroups-agent.c (+7/-0)
src/core/bpf/restrict_ifaces/restrict-ifaces.bpf.c (+1/-1)
src/core/dbus.c (+3/-1)
src/core/import-creds.c (+4/-4)
src/core/load-fragment.c (+46/-12)
src/core/main.c (+10/-7)
src/core/mount.c (+7/-5)
src/core/namespace.c (+4/-1)
src/core/scope.c (+1/-1)
src/core/systemd.pc.in (+2/-0)
src/coredump/coredump.c (+9/-2)
src/dissect/dissect.c (+1/-0)
src/fundamental/sha256.c (+1/-1)
src/home/homed-home-bus.c (+2/-0)
src/home/homework-cifs.c (+5/-0)
src/home/homework-luks.c (+4/-8)
src/home/homework-mount.c (+2/-0)
src/home/homework.h (+2/-1)
src/import/pull-common.h (+9/-9)
src/integritysetup/integritysetup.c (+6/-6)
src/journal-remote/microhttpd-util.c (+1/-1)
src/kernel-install/kernel-install.in (+1/-1)
src/libsystemd-network/dhcp6-option.c (+7/-7)
src/libsystemd-network/sd-dhcp-lease.c (+1/-1)
src/libsystemd-network/sd-dhcp6-lease.c (+22/-12)
src/libsystemd-network/test-dhcp6-client.c (+42/-0)
src/libsystemd/sd-bus/sd-bus.c (+1/-1)
src/libsystemd/sd-device/device-internal.h (+1/-1)
src/libsystemd/sd-device/device-monitor.c (+2/-2)
src/libsystemd/sd-device/device-private.c (+33/-22)
src/libsystemd/sd-device/device-private.h (+3/-3)
src/libsystemd/sd-device/sd-device.c (+3/-0)
src/libsystemd/sd-device/test-sd-device.c (+18/-4)
src/libsystemd/sd-event/sd-event.c (+1/-1)
src/libsystemd/sd-event/test-event.c (+52/-0)
src/libsystemd/sd-id128/id128-util.c (+4/-4)
src/libsystemd/sd-journal/journal-verify.c (+6/-1)
src/libsystemd/sd-journal/sd-journal.c (+2/-0)
src/locale/keymap-util.c (+1/-1)
src/network/netdev/l2tp-tunnel.c (+1/-1)
src/network/netdev/macsec.c (+0/-2)
src/network/netdev/wireguard.c (+0/-2)
src/network/networkctl.c (+1/-1)
src/network/networkd-dhcp-common.c (+4/-7)
src/network/networkd-dhcp4.c (+0/-5)
src/network/networkd-dhcp6.c (+0/-5)
src/network/networkd-link.c (+1/-1)
src/network/networkd-ndisc.c (+5/-13)
src/network/networkd-radv.c (+8/-3)
src/nspawn/nspawn-settings.c (+5/-0)
src/nspawn/nspawn.c (+2/-2)
src/partition/growfs.c (+5/-1)
src/partition/repart.c (+2/-2)
src/portable/profile/trusted/service.conf (+2/-1)
src/resolve/resolved-bus.c (+1/-7)
src/resolve/resolved-dns-cache.c (+28/-6)
src/resolve/resolved-dns-cache.h (+1/-1)
src/resolve/resolved-dns-packet.c (+28/-10)
src/resolve/resolved-dns-packet.h (+2/-0)
src/resolve/resolved-dns-scope.c (+11/-8)
src/resolve/resolved-dns-transaction.c (+157/-104)
src/resolve/resolved-dns-transaction.h (+0/-4)
src/resolve/resolved-mdns.c (+25/-10)
src/rpm/macros.systemd.in (+1/-0)
src/shared/base-filesystem.c (+1/-1)
src/shared/dissect-image.c (+1/-0)
src/shared/dns-domain.c (+1/-1)
src/shared/json.c (+3/-1)
src/shared/logs-show.c (+1/-1)
src/shared/mount-util.c (+2/-0)
src/shared/seccomp-util.c (+1/-0)
src/shared/utmp-wtmp.h (+1/-1)
src/sleep/sleep.conf (+1/-1)
src/sysext/sysext.c (+1/-0)
src/systemctl/systemctl-list-unit-files.c (+1/-1)
src/systemctl/systemctl-show.c (+4/-4)
src/systemctl/systemctl-util.c (+3/-1)
src/systemctl/systemctl.c (+6/-5)
src/systemd/_sd-common.h (+1/-1)
src/test/test-dns-domain.c (+1/-0)
src/test/test-loop-block.c (+1/-0)
src/test/test-sd-hwdb.c (+1/-1)
src/test/test-set.c (+30/-0)
src/test/test-time-util.c (+5/-0)
src/tmpfiles/tmpfiles.c (+8/-11)
src/udev/udev-rules.c (+4/-4)
src/udev/udevd.c (+1/-1)
test/units/testsuite-04.sh (+1/-1)
test/units/testsuite-67.sh (+25/-4)
units/modprobe@.service (+1/-0)
units/systemd-udev-trigger.service (+1/-1)
Reviewer Review Type Date Requested Status
Lukas Märdian Approve
Review via email: mp+428504@code.staging.launchpad.net

Description of the change

Merge of systemd 251.4-1 from Debian. I will post the PPA autopkgtest results when they have finished.

To post a comment you must log in.
Revision history for this message
Lukas Märdian (slyon) wrote (last edit ):

+1 for DENYLISTing the 29-PORTABLE test, it seems to fail more often than not. Maybe we could also update the upstream bug report with some logs from autopkgtest.ubuntu.com to provide some evidence.

As suggested earlier, I think we need to upgrade the systemd -> (Suggests:) -> systemd-resolved to something stronger, probably "Depends:" in Ubuntu. As Ubuntu has been using systemd-resolved by default for a while.

LGTM otherwise.

PS: I also like the enablement of systemd-homed, wanted to do this for a long time but never found the time (and a proper reason in Ubuntu) to get it enabled.

Revision history for this message
Nick Rosbrook (enr0n) wrote :

I opted to make systemd Recommends: systemd-resolved to avoid circular Depends: between the two packages. The Recommends: is strong enough to ensure that systemd-resolved is installed with systemd by default.

Some PPA autopkgtests are here: https://autopkgtest.staging.ubuntu.com/results/autopkgtest-kinetic-enr0n-systemd-251/?format=plain

Something odd is going in with armhf (apt-source systemd fails), but I have not been able to re-create the issue outside autopkgtest.

On arm64, my PPA builder is using proposed by default, despite the PPA dependencies being configured otherwise. This means the package on arm64 wants libc6 2.36, which cannot be satisfied without proposed.

Still waiting for tests to finish on ppc64el, but tests are passing on amd64 and s390x.

Overall, we may have some work to do to get this version migrated, but I don't think we should block the upload on these PPA autopkgtest issues.

Revision history for this message
Lukas Märdian (slyon) wrote :

Thanks for explaining the test failures!

+1

review: Approve

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches