This makes things more consistent with how we pass in utillinuxMinimal.
There's already a minimal argument in the gnupg derivation, but this
gnupg is even more minimal. Instead of defining a gnupgSuperMinimal, we
define it inline inside systemd.
systemd 246 started baking in some strings into $lib/lib/libsystemd.so
which points back to $out.
It might be desirable to not have these strings in there, but instead
have systemd ask the running manager for the really active paths via
IPC, or patch in some more mutable paths (like /run/current-system/…) -
but as long as it is as it is, we should probably should just stop
producing the `lib` output for now.
This does increase the runtime closure for installations not pulling in
systemd.out, or linking against multiple libsystemd's, but doesn't
increase the runtime closure for NixOS itself, as it needs systemd
anyways, and doesn't link against multiple variants of it.
We can also remove the aarch64-specific $out/lib/systemd/catalog hack,
and revive it at a later time if the `lib` output is reintroduced.
This package previously did override the systemd package, and instructed
ninja, systemd's previous build system, to only build the
cryptsetup-specific systemd generators (plus some manual rpath
massaging, as ninja install wasn't used).
Afterwards, users were expected to add this package to their
`systemd.generator-packages` (or since
https://github.com/NixOS/nixpkgs/pull/65376/files `systemd.packages`)
NixOS module options, so systemd will use these generators.
As the previous commit added cryptsetup support directly to the systemd
package (and pkgs.systemd now already ships the cryptsetup generators),
we don't need another package shipping the same generators.
There's a circular dependency to systemd via cryptsetup and lvm2
(systemd -> cryptsetup -> lvm2 -> udev=systemd).
However, cryptsetup only really needs the devmapper component shipped
with lvm2. So build `pkgs.cryptsetup` with a lvm2 that doesn't come with
udev.
This disabled systemd-journal-upload and systemd-journal-remote.
We didn't install the unit files anyways, so this was probably not used
at all, and currently fails to build due to libmicrohttpd and systemd
code being incompatible:
```
../src/journal-remote/journal-remote-main.c: In function ‘setup_microhttpd_server’:
../src/journal-remote/journal-remote-main.c:431:38: error: passing argument 5 of ‘MHD_start_daemon’ from incompatible pointer type [-Werror=incompatible-pointer-types]
```
This permits using method_set_hostname but still denies
method_set_static_hostname. As a result DHCP clients can now always set
the transient hostname via the SetHostname method of the D-Bus interface
of systemd-hostnamed (org.freedesktop.hostname1.set-hostname).
If the NixOS option networking.hostName is set to an empty string (or
"localhost") the static hostname (kernel.hostname but NOT /etc/hostname)
will additionally be updated (this is intended).
From "man hostnamectl": The transient hostname is a fallback value
received from network configuration. If a static hostname is set, and is
valid (something other than localhost), then the transient hostname is
not used.
Fix#74847.
Note: It's possible to restrict access to the org.freedesktop.hostname1
interface using Polkit rules.
changes:
- aa0cb635f1 (tag: v245.6) network: L2TP fix crash
- 9774347b57 Fix typo.
- 2cac801f0f stat-util: trivial empty_or_null() tweaks
- b054e69bf9 Check ambient set against bounding set prior to applying ambient set
- bed695375a udev: when the BSD lock on a block device is taken, don't complain
- 66fcfdfde7 core: add forgotten return in error path
- 05dd19fad3 shared/efi-loader: remove check that uses absolute tick value
- 753a71ad1d gpt: include homed GPT partition type in well-known partition table
- 3668722049 units: don't set PrivateNetwork= in systemd-homed.service
- 2bca2d77d3 resolved-dns-query: remove dns_query_candidate_is_routable
- a3f6020432 sd-network: fix inverted error message
- a7a9fe3c93 network: allow empty assignment to PreferredLifetime=
- 8df6fc1241 Update resolvectl zsh completion
- c1a83277d0 shared: treat generator units as vendor units
- 1f382d818d tree-wide: fix bad errno checks
- 667c207683 bus-message: immediately reject messages with invalid type
- 116a8eadb6 bus-message: fix negative offset with ~empty message
- 4d5779d886 load-fragment: fix a typo
- c8b6de003a NEWS: retroactively document Family=
- cf6b8e6ec5 man: fix dir name in sysctl.d(5)
- 6d009b7a25 journalctl,elsewhere: make sure --file=foo fails with sane error msg if foo is not readable
- cf786ef164 makefs: log about OOM condition
- 0b1839822f blockdev: propagate one more unexpected error
- d78ce949d0 repart: don't insist on coming up on partition label ourselves
- 9e1363fcc6 journal: fix dropping first record during upload to remote journal
- 50cb4e418d meson: initialize time-epoch to reproducible builds compatible value
- 76abe079b7 limit-util: quieten a very common debug message that is misleading
- b3e484a3b1 shared: fix integer overflow in calendarspec
- 0c29eea969 repart: suppress complaints about lack of BLKRRPART when operating on regular file
- 3db52f5ed8 repart: explain when we exit early and don't do a thing
- d99cba3aaa mount: introduce mount_is_nofail() helper
- 7bc4bcea15 mount: default startup dependencies and default network ones are orthogonal
- 7fe617fa53 mount: introduce mount_add_default_ordering_dependencies()
- e1c091b6d4 automount: fix handling of default dependencies for automount units
- ae05a137c9 mount: let pid1 alone handle the default dependencies for mount units
- f1fb197176 mount: mount unit activated by automount unit should be only ordered against the automount unit
- c9bcc69703 generator: don't generate device dependencies for extrinsic mounts
- ebac09ea0a fstab-util: introduce fstab_is_extrinsic()
- a20e4ea0ed device: drop refuse_after
- 2799fffac1 man: drop some left-over mentions of StandardOutput=syslog
- 144aff9c3b sd-netlink: remove unused RTNL_WQUEUE_MAX define
- 34ca8df8e1 test: Add return 0 to main() function (even it is not strictly necessary)
- 6e03f328a9 network: 'cur' variable cannot be null, so simplify code
- 8d0c97f6ca tree-wide: Initialize _cleanup_ variables if needed
- 4f174e49ae netlink: Fix assert condition on n_containers
- 3905ce532c journald: Increase stdout buffer size sooner, when almost full
- 5a37eb7c61 core: don't bind varlink socket if running in test mode
- 33fff72ce6 pam_systemd: also print debug lines when ending a session
- ba9af79ccb pam_systemd_home: use correct macro for converting ptr to fd
- 6199235489 Fix misuse of PAM_PROMPT_ECHO_OFF in systemd-homed
- c180a2c452 shared/ethtool-util: hush gcc warnings about array bounds
- 1addba4aac core: fix compilation with gcc -O3
- 9c46b97161 random-util: use ERRNO_IS_NOT_SUPPORTED() macro
- d85f9093d2 tmpfiles: clarify that "!" lines are filtered before collisions are checked
- 2fac966a5c man: mention the exclamation mark and minus sign literally, to make things searchable
- 4f61be3373 man: clarify that exit status name mappings are unaffected by SuccessExitStatus=
- b747d74a41 seccomp-util: add new syscalls from kernel 5.6 to syscall filter table
- c30d8caf8b tree-wide: Replace assert() by assert_se() when there is side effect
- b6e8e3be7e networkctl: use uint64_t for link speed throughout
- be66ce6089 tree-wide: use CMSG_SPACE() (and not CMSG_LEN()) to allocate control buffers
- 1cb197798a man: suffix pam options with "=" where arg is required too
- a5fe01d3da test: Use assert_se() where variables are only checked by assert
- 6960efd198 tree-wide: Fix, replace assert() by assert_se() when there is side effect
- 93c1b03074 tree-wide: Mark as _unused_ variables that are only used in assert()
- c7679d7a9f tree-wide: Workaround -Wnonnull GCC bug
- 073b257fd7 man: bring example PAM snippet of pam_systemd and pam_systemd_home back in sync
- 855291a81c man: highlight relevant lines in pam_systemd_home.so example PAM snippet
- f89ad7c0fd login: include pam_systemd_home.so in the default PAM snippet we ship for user@.service
- 9357f9466f test: Skip test-boot-timestamps on permission denied
- cad4ebe14e sysusers: be extra careful when locking accounts
- 551e6f233a shared/install: print name of offending file in error
- c6a2e51232 systemctl: fix --root support in querying presets
- 6f1eedbfdd systemctl: fix hint when 'systemctl help' is given
- 925521df7c shared/unit-file: fix resolution of absoulute symlinks with --root
- 756ba362e8 man: mention that ProtectSystem= also takes care of /efi
- 4f77cf43b5 man: systemd.service: systemd-analyze exit-codes -> exit-status
- 7c6ea7a053 man: expand on the star…end/repetition time expressions
- e06b940792 calendarspec: be more graceful with two kinds of calendar expressions
- f3dd0b476d calendarspec: minor simplification
- 3581c16d56 shutdown: fix spacing in shutdown error message
- 9556255349 nspawn: mount custom paths before writing to /etc
- 37447b7e78 repart: fix partition maximum size segfault
- 7f231ba503 link: Add units and fix typo in (Rx|Tx)BufferSize= manpage. Clean up the implementation slightly
- e75d2cdb0b main: bump RLIMIT_MEMLOCK by physical RAM size
- e16b9a1e31 nspawn: be more careful with creating/chowning directories to overmount
- 765d184a69 homectl: say "home area" in more places
- c11bff4fa7 userdbctl: make --help fit in 80 columns
- 0e56c2ef3f shell-completion/zsh: update systemd-analyze completions
- 2bb580f994 zsh: fix disable/enable completion
- 607a19a309 cgroup-util: check for SYSFS_MAGIC when detecting cgroup format
- ddb3c38efc stat-util: no need to open a file to check fs type
- bd8842304c sysusers,tmpfiles: always mention error when failing to replace specifiers
- bdea9b65d2 sysusers: add accidentally forgotten 'return'
- 17b059774d man: document binfmt's new --unregister switch
- 560380d8ec binfmt: also unregister binfmt entries from unit
- 80835d9c51 binfmt: modernize code a bit
- a1745741b8 shutdown: unregister all binfmt_misc entries before entering shutdown loop
- b637445950 shared: add common helper for unregistering all binfmt entries
- 0215625e99 home: fix strv NUL termination
- 038988baa1 networkd: don't do lldp rx nor tx on bond devices
- 9512d576d9 sd-bus: Fix typo in sd_bus_message_append_array docs
- 63cef71dd0 shared: add NULL callback check in one more place
- 6b91ca22a2 core: fix unused variable warning when !HAVE_SECCOMP
- f7c1c79c57 udev: prepare memory for extra NUL termination for NULSTR
- 69e0ef0d99 tree-wide: use recvmsg_safe() at various places
- cd0a84d4e9 socket-util: add recvmsg_safe() wrapper that handles MSG_CTRUNC
- 2bb48c704b sd-bus: work around ubsan warning
- c147bba1fb shared: Don't try calling NULL callback in bus_wait_for_units_clear
- f907491463 run: don't wait for start job to complete when running interactively anyway
- d3d1550a5d man: Fix typo "multiplied with" -> "multiplied by"
- ae5a9f27c5 core: make sure we don't get confused when setting TERM for a tty fd
- a07d3eaf76 man: document that VirtualEthernetExtra= has nothing to do with Bridge=
- 35fe81078e core: add debug log when a job in the activation queue is not runnable
- a0cd882be8 core: add log_get_max_level check optimization in log_unit_full
- 2a6ad1093c util: return the correct correct wd from inotify helpers
- 9ec244c5c1 core: minor error code handling fixes
- a799283c91 man: document how to get the boot menu with zero time-out
- 7263e86c8d resolved: return org.freedesktop.resolve1.DnsError.NXDOMAIN on LLMNR resolution failure
- 6eab4c2b3e man: use manpages.ubuntu.com for resolvconf(8) link
- 75ccec5cde man: add a note that resolvconf updates /etc/resolv.conf in specific circumstances
- 3e3a31743a resolvectl: fix indentation of hexdump'ed packets
- 6576058fab journald: add configuration option for enabling/disabling audit during journald startup
- 52c5909f15 man/systemd-service: clarify env variable expansion
- ac08df59c0 resolved: fix typo in an unused function and add comment
This was very similar to the Mesa issues fixed in
62e6d73a09: the user-written code is
looking up an unprefixed binutils program.
[I think we should have a way in Meson of specifying a program prefix in
the cross / native files, as a fallback for any program that isn't
explicitly specified. This could both be availible for user written
rules, and help with the default rules.]
Fixes https://github.com/NixOS/mobile-nixos/issues/161
The paths in the generated `systemd.pc` were flipped, fix this:
`systemdsystemunitpath`: `/nix/var/nix/profiles/default/lib/systemd/{user => system}`
`systemduserunitpath`: `/nix/var/nix/profiles/default/lib/systemd/{system => user}`
The paths actually used in the code (further below in that patch) were
correct, so keep them there.
Fixes#59473.
It seems nix is much more permissive in applying patches than git am.
These patches were regenerated by running
`git am path/to/nixpkgs/pkgs/os-specific/linux/systemd/*.patch`,
and manually running `patch -p1 < path/to/nixpkgs/pkgs/os-specific/linux/systemd/*N.patch`
where necessary.
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.
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 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.
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.
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)
This bumps to the latest state of the systemd 242 stable, published at
https://github.com/systemd/systemd-stable/tree/v243-stable.
Should cover CVE-2020-1712.
Git Log:
f8dd0f2f15 (tag: v243.7, systemd-stable/v243-stable) Revert "Support Plugable UD-PRO8 dock"
1a5428c2ab hibernate-resume-generator: wait "infinitely" for the resume device
eb3148c468 (tag: v243.6) hwdb: update to v245-rc1
f14fa558ae Fix typo in function name
fb21e13e8e polkit: when authorizing via PK let's re-resolve callback/userdata instead of caching it
2e504c92d1 sd-bus: introduce API for re-enqueuing incoming messages
4d80c8f158 polkit: use structured initialization
54791aff01 polkit: on async pk requests, re-validate action/details
81532beddc polkit: reuse some common bus message appending code
4441844d58 bus-polkit: rename return error parameter to ret_error
31a1d569db shared: split out polkit stuff from bus-util.c → bus-polkit.c
560eb5babf test: adapt to the new capsh format
275b266bde meson: update efi path detection to gnu-efi-3.0.11
9239154545 presets: "disable" all passive targets by default
a827c41851 shared/sysctl-util: normalize repeated slashes or dots to a single value
fb1bfd6804 dhcp6: do not use T1 and T2 longer than one provided by the lease
ca43a515c6 network: fix implicit type conversion warning by GCC-10
421eca7edf bootspec: parse random-seed-mode line in loader.conf
34e21fc6de sd-boot: fix typo
df7b3a05c9 test: Synchronize journal before reading from it
9326efee71 sd-bus: fix introspection bug in signal parameter names
7bbdc56aaf efi: fix build.
486f8ca365 generator: order growfs for the root fs after systemd-remount-fs
56d442e29d loginctl: use /org/freedesktop/login1/session/auto when "lock-session" is called without argument
6ed1152282 Documentation update for x-systemd.{before,after}
dba3efa34a man: fix typo in systemd.netdev Xfrm example
6f9a8621d8 timesyncd: log louder when we refuse a server due to root distance
0637255d3b resolved: drop DNSSEC root key that is not valid anymore
9a135baa40 journal: don't use startswith() on something that is not a NUL-terminated string
1ff3972a0f test: add test for https://github.com/systemd/systemd/issues/14560
cac79b606b core: make sure StandardInput=file: doesn't get dup'ed to stdout/stderr by default
906ba9a67d pkgconf: add full generator paths
01b93e2c68 tree-wide: we forgot to destroy some bus errors
5c9455657e mount: make checks on perpetual mount units more lax
28c58beca1 core: never allow perpetual units to be masked
d3b044b3e7 typo: "May modify to" -> "May modify"
fd378d3d3c sysctl: downgrade message when we have no permission
db4fbf5c61 Clarify journald.conf MaxLevelStore documentation
c8365f71c0 logind: refuse overriding idle hint on tty sessions
cd91f567b6 cgroup: update only siblings that got realized once
c672dcd212 mount: mark an existing "mounting" unit from /proc/self/mountinfo as "just_mounted"
a592a40564 journalctl: Correctly handle combination of --reverse and --lines (fixes#1596)
0aa144ab1d journalctl: Correctly handle --show-cursor in combination with --until or --since and --reverse
3b803a5e66 core: fix re-realization of cgroup siblings
7549dd40fc core: propagate service state to socket in more load states
af6df343b2 man: describe "symlink" and "systemctl link" explicitly in UNIT FILE LOAD PATH
a3c1ce25a7 core: be more restrictive on the dependency types we allow to be created transiently
2b9ec8384c udev: don't import parent ID_FS_ data on partitions
ecd95c507c man: fix option name
0d4f06156b Support Plugable UD-PRO8 dock
7fba869abd gpt-auto: don't assume XBOOTLDR is vfat
494c281b67 man: fix documentation of IBM VIO device naming
7271fb056a man: slightly extend documentation on difference between ID_NET_NAME_ONBOARD and ID_NET_LABEL_ONBOARD
852ae28e68 boot: fix osrel parser
2613200370 udev: do not use exact match of file permission
46477397c1 network: lower the log-level of harmless message
7163b1fe86 hwdb: ignore keys added in kernel 5.5
92f90837dc systemctl: skip non-existent units in the 'cat' verb
a67227cc99 systemd.exec: document the file system for EnvironmentFile paths
cfb4c0aca5 systemd-analyze: fixed typo in documentation
017fddd998 test-condition: fix group check condition
9d5e3cb774 umount: show correct error message
252f1a5277 Revert "Drop dbus activation stub service"
20bbfac95e man: add section about user manager units
c93ef60212 man: add remote-*.targets to the bootup sequence
55e0f99689 time-util: also use 32bit hack on EOVERFLOW
7afe2ecb02 [man] note which UID ranges will get user journals
a43b67a4c9 [man] fix URL
dedb26a8d6 analyze: badness if neither of RootImage and RootDirectory exists
714c93862a initrd: make udev cleanup service confict trigger and settle too
8932407ae1 man: we support growing xfs too these days
19af11dc07 time-util: deal with systems where userspace has 64bit time_t but kernel does not
c90229d81d [import] fix stdin/stdout pipe behavior in import/export tar/raw
39910328da cryptsetup-generator: unconfuse writing of the device timeout
fc5e6c87a4 shared/install: log syntax error for invalid DefaultInstance=
409c94a407 shared/install: provide a nicer error message for invalid WantedBy=/Required= values
70e8c1978a seccomp: real syscall numbers are >= 0
a0a1977d9a seccomp: more comprehensive protection against libseccomp's __NR_xyz namespace invasion
7f936c60d5 network: set ipv6 mtu after link-up or device mtu change
b59d88cc62 man: fix typo in net-naming-scheme man page
c5e5ac0958 man: fix typos (#14304)
9a2f26564d ipv4ll: do not reset conflict counter on restart
bc9e1ebfdd Fix typo (duplicate "or")
c6cb71b7e7 network: if /sys is rw, then udev should be around
67dcdfd956 nspawn: do not fail if udev is not running
a7938a1bc6 Create parent directories when creating systemd-private subdirs
53aa44f873 network: do not return error but return UINT64_MAX if speed meter is disabled
65abf12674 core: swap priority can be negative
b1cf452ff5 systemctl: enhance message about kexec missing kernel
07a0e5b425 man: use mkswap@ instead of makeswap@
57dc017c6b journald: don't ask for the machine ID if we don't need it
ac392a57c0 journalctl: pager_close() calls fflush(stdout) anyway as first thing
ee7dfadc82 journald: remove unused field
471073f1b5 journalctl: return EOPNOTSUPP if pcre is not enabled
002ededb61 man: drop reference to machined, add one for journald instead
fd3bd4be3b pid1: make TimeoutAbortSec settable for transient units
eb2ef4d664 pid1: fix setting of DefaultTimeoutAbortSec
1d75e29b23 shared/ask-password-api: modify keyctl break value
a16b1ee7e5 cryptsetup: reduce the chance that we will be OOM killed
4836fb010a core: write out correct field name when creating transient service units
3e2c547f6d udevd: don't use monitor after manager_exit()
d42f7d45a8 Revert "udevd: fix crash when workers time out after exit is signal caught"
c9a287eee8 man/systemd.link: Add missing verb *be*
a67a3ae04b man: document all pager variables for systemctl and systemd
3a8fce3f38 core.timer: fix "systemd-analyze dump" and docs syntax inconsistencies wrt OnTimezoneChange=
fdffd284b6 core/service: downgrade "scheduling restart" message to debug
733e7f19d3 travis: add missing closing quote sign
0d7b7817fc systemd-tmpfiles: don't install timer when service isn't installed either
0e7f83cd2b pam_systemd: prolong method call timeout when allocating session
Adding `systemd-importd` to the build, so that `machinectl`s `import-.*`
may actually do anything. Currently they fail with
```
Failed to transfer image: The name org.freedesktop.import1 was not provided by any .service files
```
as `systemd-importd` is not built. Also registers the regarding dbus
api and service in the systemd module.
This enlarges the system uid/gid range 6-fold, from 100 to 600 ids. This
is a preventative measure against running out of dynamically allocated
ids for NixOS services with isSystemUser, which should become the
preferred way of allocating uids for non-real users.
