Skip to content

systemd: 249.5 -> 249.7 & various fixes#149153

Merged
flokli merged 6 commits intoNixOS:stagingfrom
helsinki-systems:systemd-upd-and-misc
Dec 7, 2021
Merged

systemd: 249.5 -> 249.7 & various fixes#149153
flokli merged 6 commits intoNixOS:stagingfrom
helsinki-systems:systemd-upd-and-misc

Conversation

@ajs124
Copy link
Member

@ajs124 ajs124 commented Dec 6, 2021

Motivation for this change

This is a rebase version of #121371 + the bump to 249.7

cc @arianvp @flokli

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

ajs124 and others added 5 commits December 6, 2021 14:39
It was originally moved because of nixops autoLuks feature which
has been unsupported for a while.

See:
* NixOS#62211
* NixOS/nixops#1156 (comment)

systemd-tmpfiles-setup-dev.service needs to run very  early (even before
udev runs) because udev rules assume static device nodes already exist
even before udev is started. If these static device nodes do not exist;
systemd might have trouble mounting filesystems that require static
device nodes (like loopfs and btrfs).
…rget

Since https://github.com/NixOS/nixpkgs/pull/56184/files  local-fs.target
is already pulled in by sysinit.target

swap.target has always already been pulled in by sysinit.target
There is no real harm having them there; but it means these units really
only become active if there is a service providing the underlying
functionality.

nss-lookup.target should not be pulled in unconditionally. It should be
pulled in by providers of DNS lookups. E.g. systemd-resolved.service has
a Wants=nss-lookup.target, Before=nss-lookup.target. So once
systemd-resolved.service has finished starting up; other units that rely
on DNS can be started; but if systemd-resolved is not enabled; those
units can start up immediately.

Same story goes for nss-user-lookup.target and daemons like sssd.

From https://systemd.io/UIDS-GIDS/:

 Note that nss-user-lookup.target is a passive unit: in order to
 minimize synchronization points on systems that don’t need it the unit
 is pulled into the initial transaction only if there’s at least one
 service that really needs it, and that means only if there’s a service
 providing the local user database somehow through IPC or suchlike.
@ajs124 ajs124 requested a review from dasJ as a code owner December 6, 2021 22:57
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 8.has: module (update) This PR changes an existing module in `nixos/` labels Dec 6, 2021
@ofborg ofborg bot added the ofborg-internal-error Ofborg encountered an error label Dec 6, 2021
@kloenk kloenk requested review from andir, edolstra and flokli December 7, 2021 08:46
Copy link
Member

@flokli flokli left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Build queued ;-)

@@ -166,14 +166,6 @@ stdenv.mkDerivation {
# all our root unit dirs if they are symlinks. This does exactly what we
# need (AFAICT).
./0019-core-handle-lookup-paths-being-symlinks.patch
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor nit: We should add a link to systemd/systemd#20479 here, so the PR sent upstream can be found easier.

@ajs124 ajs124 force-pushed the systemd-upd-and-misc branch from d52d416 to e2f009e Compare December 7, 2021 09:10
@ofborg ofborg bot requested review from flokli and kloenk December 7, 2021 10:03
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Dec 7, 2021
@yu-re-ka yu-re-ka removed the ofborg-internal-error Ofborg encountered an error label Dec 7, 2021
@flokli flokli mentioned this pull request Dec 7, 2021
10 tasks
@flokli
Copy link
Member

flokli commented Dec 7, 2021

Let's cook this in staging a bit :-)

@flokli flokli merged commit c6f07ea into NixOS:staging Dec 7, 2021
@yu-re-ka
Copy link
Contributor

yu-re-ka commented Dec 7, 2021

Should this upgrade the running init process when running rebuild switch?

+ ssh -p62954 yaya.yuka.dev 'sudo /nix/var/nix/profiles/system/bin/switch-to-configuration switch'
updating GRUB 2 menu...
removing obsolete file /boot/kernels/nranbvnqg5ijmjrnvj6g5fg2w90ia3ha-initrd-linux-5.15.4-initrd
removing obsolete file /boot/kernels/shl48yrwmdxnndrmim11ylbvpsfzjjc3-linux-5.15.4-bzImage
stopping the following units: acme-fixperms.service, audit.service, bind.service, coturn.service, deluged.service, dhparams-init.service, docker.service, docker.socket, dovecot2.service, gitea-port-forward.service, gitea.service, gotify-server.service, hedgedoc.service, heisenbridge.service, iperf3.service, jellyfin.service, jicofo.service, jitsi-videobridge2.service, kmod-static-nodes.service, matrix-synapse.service, mautrix-telegram.service, mount-pstore.service, network-local-commands.service, nix-daemon.service, nix-daemon.socket, nscd.service, opendkim.service, pleroma.service, postfix.service, postgresql.service, proc-sys-fs-binfmt_misc.automount, prometheus-jitsi-exporter.service, prometheus-nginx-exporter.service, prometheus-node-exporter.service, prosody.service, radicale.service, redis.service, restic-rest-server.service, rspamd.service, systemd-binfmt.service, systemd-modules-load.service, systemd-networkd-wait-online.service, systemd-networkd.service, systemd-networkd.socket, systemd-resolved.service, systemd-sysctl.service, systemd-timesyncd.service, systemd-tmpfiles-clean.timer, systemd-tmpfiles-setup-dev.service, systemd-udev-trigger.service, systemd-udevd-control.socket, systemd-udevd-kernel.socket, systemd-udevd.service, trainsearch.service, up-rewrite-proxy.service, vnstat.service, zram-reloader.service
NOT restarting the following changed units: [email protected], systemd-fsck@dev-disk-by\x2duuid-95271c9f\x2dcd5a\x2d4c29\x2da2c8\x2da7b22ac95184.service, systemd-fsck@dev-disk-by\x2duuid-9a4eac20\x2d0c82\x2d4793\x2d9537\x2d4970273d7204.service, systemd-journal-flush.service, systemd-logind.service, systemd-random-seed.service, systemd-remount-fs.service, systemd-tmpfiles-setup.service, systemd-update-utmp.service, systemd-user-sessions.service, [email protected], [email protected], zram-init-zram0.service
activating the configuration...
setting up secrets...
setting up /etc...
setting up secrets...
restarting systemd...
reloading user units for yuka...
setting up tmpfiles
reloading the following units: dbus.service, dev-hugepages.mount, dev-mqueue.mount, gitlab-runner.service, nftables.service, proc-sys-fs-binfmt_misc.mount, reload-systemd-vconsole-setup.service, sys-fs-fuse-connections.mount, sys-kernel-config.mount, sys-kernel-debug.mount
gitlab-runner.service is not active, cannot reload.
proc-sys-fs-binfmt_misc.mount is not active, cannot reload.
restarting the following units: home-manager-yuka.service, nginx.service, sshd.service, systemd-journald.service
starting the following units: acme-fixperms.service, audit.service, bind.service, coturn.service, deluged.service, dhparams-init.service, docker.socket, dovecot2.service, gitea-port-forward.service, gitea.service, gotify-server.service, hedgedoc.service, heisenbridge.service, iperf3.service, jellyfin.service, jicofo.service, jitsi-videobridge2.service, kmod-static-nodes.service, matrix-synapse.service, mautrix-telegram.service, mount-pstore.service, network-local-commands.service, nix-daemon.socket, nscd.service, opendkim.service, pleroma.service, postfix.service, postgresql.service, proc-sys-fs-binfmt_misc.automount, prometheus-jitsi-exporter.service, prometheus-nginx-exporter.service, prometheus-node-exporter.service, prosody.service, radicale.service, redis.service, restic-rest-server.service, rspamd.service, systemd-binfmt.service, systemd-modules-load.service, systemd-networkd-wait-online.service, systemd-networkd.socket, systemd-resolved.service, systemd-sysctl.service, systemd-timesyncd.service, systemd-tmpfiles-clean.timer, systemd-tmpfiles-setup-dev.service, systemd-udev-trigger.service, systemd-udevd-control.socket, systemd-udevd-kernel.socket, trainsearch.service, up-rewrite-proxy.service, vnstat.service, zram-reloader.service
the following new units were started: systemd-vconsole-setup.service

@dasJ dasJ deleted the systemd-upd-and-misc branch December 7, 2021 12:45
@dasJ
Copy link
Member

dasJ commented Dec 7, 2021

@yu-re-ka It does: restarting systemd...

@yu-re-ka
Copy link
Contributor

yu-re-ka commented Dec 7, 2021

Somehow didn't notice that line, everything is good then :)

@github-actions
Copy link
Contributor

github-actions bot commented Dec 8, 2021

Successfully created backport PR #149719 for staging-21.11.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: systemd Software suite that provides an array of system components for Linux operating systems. 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants