Comparing changes
Open a pull request
base repository: NixOS/nixpkgs
base: 1ea80c2cc378
head repository: NixOS/nixpkgs
compare: 19de59a9bec0
- 14 commits
- 19 files changed
- 3 contributors
Commits on Apr 16, 2020
-
systemd: switch from our own fork to upstream repo + local patches
After patching, this produces exactly the same source code as in our custom fork, but having the actual patches inlined inside nixpkgs makes it easier to get rid of them. In case more complicated rebasing is necessary, maintainers can - Clone the upstream systemd/systemd[-stable] repo - Checkout the current rev mentioned in src - Apply the patches from this folder via `git am 00*.patch` - Rebase the repo on top of a new version - Export the patch series via `git format-patch $newVersion` - Update the patches = [ … ] attribute (if necessary)
-
-
systemd: drop 0027-Start-getty-on-lxc.patch
Since quite some time, systemd starts getty on these consoles automatically.
-
systemd: drop 001{4,5}-{catalog,hwdb}-don-t-update-on-install.patch
These patches removed logic in the meson install phase invoking `journalctl --update-catalog` and `systemd-hwdb update`, which would mutate the running system, and obviously fails in the sandbox. Upstream also knows this is a bad thing if you're not on the machine you want to deploy to, so there's logic in there to not execute it when DESTDIR isn't empty. In our case, it is - as we set --prefix instead for other reasons, but by just setting DESTIDIR to "/", we can still trigger these things to be skipped. The patches removed some context from 0018-Install-default-configuration-into-out-share-factory.patch, which we need to introduce there to make that patch still apply.
-
systemd: drop 0017-Fix-mount-option-x-initrd.mount-handling-35268-16.…
…patch This was simply undoing a hunk from 0008-Don-t-try-to-unmount-nix-or-nix-store.patch, so drop that one from there and omit 0017-Fix-mount-option-x-initrd.mount-handling-35268-16.patch entirely.
-
systemd: update paths kmod-static-nodes.service
The previous patch just removed a `ConditionFileNotEmpty=…` line from `kmod-static-nodes.service` referring to a location not existing on NixOS. We know better, and can actually replace this Condition to point to `run/booted-system/kernel-modules/lib/modules/%v/`, instead of just patching it out.
-
This required some changes in how we treat DEFAULT_PATH_NORMAL.
-
-
-
-
systemd: explicitly disable homed for now
We don't currently have tests to ensure it works and keeps working. So instead of having it accidentially working, and possibly breaking it in the future, disable it for now.
-
systemd: explicitly disable portabled for now
This hasn't worked with 243, let's disable it for now, until we have tests and can ensure it works and keeps working.
Commits on Apr 19, 2020
-
Merge pull request #85334 from flokli/systemd-mainline2
systemd: 243.7 -> 245
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff 1ea80c2cc378...19de59a9bec0