Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

systemd: 251.5 -> 251.7 #199618

Merged
merged 1 commit into from
Nov 5, 2022
Merged

systemd: 251.5 -> 251.7 #199618

merged 1 commit into from
Nov 5, 2022

Conversation

martinetd
Copy link
Member

@martinetd martinetd commented Nov 5, 2022

Description of changes
06dc900efa network/bridge: fix UseBPDU= and AllowPortToBeRoot=
b0972e4df0 homed: properly initialize all return params
d61ccd0252 meson: always use libatomic if found
833ad5f950 Revert "Fix issue with system time set back (#24131)"
73d1dc665b bash-completion: add systemd-dissect support
d89e9993d2 dissect: add missing --umount to the help output
087cbfd936 coredump: avoid deadlock when passing processed backtrace data
ab587aaf8e shared/json: use different return code for empty input
219272f7b2 shared/json: allow json_variant_dump() to return an error
d1066f33b5 man: document restrictions on naming interfaces
e2a07cdac6 qrcode-util: Add support for libqrencode 3.0
8be601f7ef seccomp: add riscv_flush_icache to allow list
3028e05955 logind: fix getting property OnExternalPower via D-Bus
5da595db39 shared/condition: avoid nss lookup in PID1
40053e60f5 test: add more tests for StateDirectory= with DynamicUser=
0ba2e4bb69 core: do not create symlink to private directory if parent already exists
1de3cb97ee core: make exec_directory_add() extends existing symlinks
d7b83b9986 sd-ndisc: ignore failure in sending solicitation
e0ba044985 analyze: add forgotten return statement
40742ac74f basic/log: include the log syntax callback in the errno protection block
3e38c39600 logind: do not emit beep in wall messages
bf13ffec59 udev: drop assertion which is always false
78a8e938e4 man/shutdown: document how to switch to single-user mode
9de8a5d5d0 libbpf: add compat helpers for libbpf down to 0.1.0
9d5d267ab3 Try to load libbpf.so.1 as well
8cc2387b03 libbpf: Remove use of deprecated APIs
4abc5b2cfe repart: always honour `--discard=no`
b3d5724bfc ata_id: Fixed getting Response Code from SCSI Sense Data (#24921)
e91ea65aba resolve: unsupported DNSSEC algorithms are considered INSECURE; not BOGUS
73db7d9932 generator: skip fsck if fsck command is missing
80dc4425db udevadm: do not try to find device unit when a path like string is provided
7add2f21f1 resolved: don't access sshfp fields from tlsa printer
9d9a970ad7 resolved: fix parameter reuse in DNS_ANSWER_FOREACH_ITEM() iterator macro
913d22cf8d kernel-install: do not fail if $layout is not "bls"
25facc6e7f units: udev: partially emulate ProtectClock=
2e6e0498aa nspawn: fix two error strings
5befffa69a xdg-autostart-service: expand tilde in Exec lines
4cb75191c4 fix typo in log
738eca5e05 meson: add libatomic dependency
c40fa78968 xdg-autostart-service: Use common boolean parser

systemd 251.6 added support for libbpf 1.0.0, so use new libbpf version.

(Note there's also systemd 252 that got released recently, not sure which version we want)

I intend to change the default version of libbpf after this and the bcc/bpftrace update get merged in master; there's no real hurry.

I'm never sure if I should target staging or master, systemd is a core component so staging is probably better? happy to retarget if appropriate.

Things done

systemd 251.6 added support for libbpf 1.0.0, so use new libbpf version.
@NickCao
Copy link
Member

NickCao commented Nov 5, 2022

I'd prefer 252, but depending on the work required, 251 is also fine.

@martinetd
Copy link
Member Author

I'd prefer 252, but depending on the work required, 251 is also fine.

happy to give that a try. I've just rebased patches and currently building to check but ofborg will probably beat my slow computer to it.

I've kept it as a separate commit to revert if required, happy to squash once this passes reviews.

Note I didn't look at musl patches -- this most definitely breaks pkgsMusl.systemd. I can eventually take a look at it if required but upstream openembedded-core does not have patches for systemd >251.4 yet so I'm not sure how you usually proceed with it -- is it ok to break?

@martinetd martinetd changed the title systemd: 251.5 -> 251.7 systemd: 251.5 -> 252 Nov 5, 2022
@NickCao
Copy link
Member

NickCao commented Nov 5, 2022

I remember musl support breaking multiple times in the history and there was little complaint, but would be happy to see it thrive. FYI, we are currently in the process of releasing 22.11 thus breaking changes (major version bump is certainly one) to systemd (as a release critical package) are restricted until at least 11/14, in other words: we still have plenty of time to get it right. Regarding the lengthy builds, you may ask for a hydra jobset dedicated to this pr from whoever have the privilege to do so.

@flokli
Copy link
Contributor

flokli commented Nov 5, 2022

I'd prefer 252, but depending on the work required, 251 is also fine.

happy to give that a try. I've just rebased patches and currently building to check but ofborg will probably beat my slow computer to it.

Sorry for the double work, but 252 is something that'd need to wait a bit until the 22.11 branch-off has happened. 251.x is just a new point release, and something that should be easier to land. I'd propose dropping the 252 bump from this PR, and leaving it for a later one.

@martinetd martinetd changed the title systemd: 251.5 -> 252 systemd: 251.5 -> 251.7 Nov 5, 2022
@martinetd
Copy link
Member Author

hah! Thanks for the info, I've dropped the 252 patch again (it's still accessible in https://github.com/martinetd/nixpkgs/commits/systemd_252 for later/if required)

Regarding build time, it's just my computer, I don't think this is too bad. I ran some nixosTests.systemd* with 251.7 and didn't run in any troubles, but let's let ofborg check again.

@flokli
Copy link
Contributor

flokli commented Nov 5, 2022

I'll run some tests on my side as well.

@flokli
Copy link
Contributor

flokli commented Nov 5, 2022

I ran the following tests:

  • nscd
  • systemd-analyze
  • systemd-bpf
  • systemd-networkd
  • systemd-networkd-dhcpserver
  • systemd-networkd-dhcpserver-static-leases
  • systemd-networkd-ipv6-prefix-delegation
  • systemd-networkd-vrf

@flokli flokli merged commit 712714e into NixOS:staging Nov 5, 2022
@martinetd
Copy link
Member Author

Thanks!

@sanderhollaar
Copy link

Sorry for the double work, but 252 is something that'd need to wait a bit until the 22.11 branch-off has happened.

In systemd < 252 there is a regression that makes expired timers not run after resume from suspend:
systemd/systemd#24984 - Persistent timer doesn't trigger after missed calendar run

Fixed with a revert:
systemd/systemd#25083 - Revert "Fix issue with system time set back

@martinetd
Copy link
Member Author

Revert "Fix issue with system time set back" This commit has already been backported in v251.7 as833ad5f950d5, so we should be good.

OTOH, there was a v251.8 tagged a couple of days ago that contains other fixes we might want, I guess we can upgrade at some point...

@flokli
Copy link
Contributor

flokli commented Nov 10, 2022

OTOH, there was a v251.8 tagged a couple of days ago that contains other fixes we might want, I guess we can upgrade at some point...

Yes please :-) can you open a PR against staging?

@flokli
Copy link
Contributor

flokli commented Nov 11, 2022

I just opened #200745, will test.

flokli pushed a commit that referenced this pull request Nov 15, 2022
Version 251.6 of systemd introduced a small change[1] that now checks
whether the fsck command is available in *addition* to the filesystem
specific fsck.$fsname executable.

When bumping systemd to version 251.7 on our side[2], we introduced that
change. This subsequently caused our "fsck" test to fail and it looks
like this was an oversight during the pull request[3] introducing the
bump.

Since the fsck wrapper binary is in util-linux, I decided to address
this by adding util-linux to fsPackages because util-linux is already
part of the closure of any NixOS system so the impact should be pretty
low.

[1]: systemd/systemd-stable@73db7d9
[2]: 844a08c
[3]: #199618

Signed-off-by: aszlig <aszlig@nix.build>
peterhoeg pushed a commit to peterhoeg/nixpkgs that referenced this pull request Nov 18, 2022
Version 251.6 of systemd introduced a small change[1] that now checks
whether the fsck command is available in *addition* to the filesystem
specific fsck.$fsname executable.

When bumping systemd to version 251.7 on our side[2], we introduced that
change. This subsequently caused our "fsck" test to fail and it looks
like this was an oversight during the pull request[3] introducing the
bump.

Since the fsck wrapper binary is in util-linux, I decided to address
this by adding util-linux to fsPackages because util-linux is already
part of the closure of any NixOS system so the impact should be pretty
low.

[1]: systemd/systemd-stable@73db7d9
[2]: NixOS@844a08c
[3]: NixOS#199618

Signed-off-by: aszlig <aszlig@nix.build>
rtimush pushed a commit to rtimush/nixpkgs that referenced this pull request Sep 21, 2023
Version 251.6 of systemd introduced a small change[1] that now checks
whether the fsck command is available in *addition* to the filesystem
specific fsck.$fsname executable.

When bumping systemd to version 251.7 on our side[2], we introduced that
change. This subsequently caused our "fsck" test to fail and it looks
like this was an oversight during the pull request[3] introducing the
bump.

Since the fsck wrapper binary is in util-linux, I decided to address
this by adding util-linux to fsPackages because util-linux is already
part of the closure of any NixOS system so the impact should be pretty
low.

[1]: systemd/systemd-stable@73db7d9
[2]: NixOS@844a08c
[3]: NixOS#199618

Signed-off-by: aszlig <aszlig@nix.build>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants