This makes curl optional if both remote and importd are disabled, and
makes some assertions more robust by switching from curl.dev != null to
lib.getDev curl != null.
upstreams TODO mentions iptables-dev (libiptc) is also used for nspawn,
but it seems like it only makes use of this via networkd anyways (or
does these days) - at least systemdMinimal compiles successfully without
iptables in the build closure.
This was only used to patch a circular output reference from lib to out
on aarch64, but was removed in b68bddfbda,
This commit forgot to remove perl, so remove it now.
This was introduced in https://github.com/NixOS/nixpkgs/pull/99621, but
didn't follow the process documented in
pkgs/os-specific/linux/systemd/default.nix, namely, the `git am` and
`git format-patch` workflow, which caused
`0019-revert-get-rid-of-seat_can_multi_session.patch` to not apply with
`git am` due to missing authorship information.
I did apply this patch manually, and copied authorship information from
4e384ddc11.
This reverts commit c778945806.
I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
Update to latest stable version. Changes:
d0f0f048ec sd-path: use ROOTPREFIX without suffixed slash
e662cf6d51 hashmap: make sure to initialize shared hash key atomically
da310c6b45 socket: downgrade log warnings about inability to set socket buffer sizes
ab6fcd9135 core: fix securebits setting
4f6925484d capability-util: add new function for raising setpcap
771436884d network: do not add prefix to RA if radv is not configured
fb2afc5f30 man: document the random delay of persistent timers
b2006ddc8f test-network: add test for ENOBUFS issue #17012
8758580ef5 backlight: do not claim that ID_BACKLIGHT_CLAMP= property is not set
57fc184a6c fs-util,tmpfiles: fix error handling of fchmod_opath()
db0f031e70 bootctl: don't accidentally propagate errors in "bootctl status"
3e2c806681 ethtool-util: don't pass error value that isn't used to log_syntax
b671730edb network: don't fail on various config parse errors
0ad86030c5 man: document that sd_bus_message_close_container() may only be called at end of container
f3da018017 cryptsetup: Fix null pointer dereference (#16987)
6f65eaf9c2 core: fix set keep caps for ambient capabilities
08338a234e core: fix comments on ambient capabilities
f0e6d9876d network: make log_link_error() or friends return void
35766dc61b core: make log_unit_error() or friends return void
3ed10b2ee8 core/slice: explicitly specify return value
2f6406914b udev: do not discard const qualifier
07671aa4cc sd-device: make log_device_error() or friends return void
d4bea73972 udev: explicitly specify return value
7db399be1e udev: return negative errno for invalid EVDEV_ABS_XXX= property
8c8d188e85 udev: make log_rule_error() or friends return void
4921375fd3 socket: fix copy/paste error
0f7fd97749 udev: warn if failed to set buffer size for device monitor
fc763d38d8 network: increase receive buffer size for device monitor
3bf7797f1f network: do not start device monitor if /sys is read-only
ebc0729c6a network: honor the buffer size specified in networkd.socket
ef3d2e178b core/socket: use fd_set_{rcv,snd}buf()
5dd4cc4b10 sd-device-monitor: use fd_set_rcvbuf()
fe9b92e566 util: introduce fd_set_{snd,rcv}buf()
4dcae66688 util: try to set with SO_{RCV,SND}BUFFORCE when requested size is larger than the kernel limit
4b6b523946 util: refuse to set too large value for socket buffer size
b4be8edb45 network: ignore error on increasing netlink receive buffer size
5ce47fb491 tree-wide: if get_block_device() returns zero devno, check for it in all cases
8ea6ec18e7 btrfs: if BTRFS_IOC_DEV_INFO returns /dev/root generate a friendly error message
e1ff4947d2 basic/log: make log_{info,warning,...} return void
8019995e9a tree-wide: correct cases where return log_{error,warning} is used without value
932f4c3e8b test-execute/exec-dynamicuser-statedir.service: fix quoting
16b9426f70 man: fix quickhelp listing in sysusers.d(5)
bde903d9e9 network: fix NDisc handling for the case when multiple routers exist
c965063b64 network: expose route_{hash,compare}_func()
6d24a40669 network: expose address_{hash,compare}_func()
054838a2e0 util: expose in6_addr_{hash,compare}_func()
58bd4a70de network: fixes gateway assignment through DHCPv4
8ad5382fe3 bash-completion: resolvectl: support 'log-level' command
a98bd75072 resolvectl: add 'log-level' to help message
78262fe807 core/socket: we may get ENOTCONN from socket_instantiate_service()
fecb3f00c4 homed: remember the secret even when the for_state is FIXATING_FOR_ACQUIRE
This bumps systemd to the latest stable maintenance release.
- dc2e82af33 core: create per-user inaccessible node from the service manager
- 0b3c497347 nspawn,pid1: pass "inaccessible" nodes from cntr mgr to pid1 payload via /run/host
- 2239965c29 coredump: don't convert s → µs twice
- 61d29b7f8c firstboot: fill empty color if ansi_color unavailable from os-release
- 9678a3daf6 varlink: do not parse invalid messages twice
- 4e516dcbc1 userdbctl: add forgotten --output mode in help
- aee20dfbd8 shared/{user,group}-record-nss: adjust filtering of "valid" passwords
- 5933d77afe doc: cross link sd_listen_fd() docs a bit
- 97fdde3239 Rework how we cache mtime to figure out if units changed
- 0500968241 core: always try to reload not-found unit
- 8ae22f0d64 pid1: use the cache mtime not clock to "mark" load attempts
- 715507c277 core: rename manager_unit_file_maybe_loadable_from_cache()
- 20ad76d0a7 man: document fd ownership for sd-bus fd marshalling
- 38ae73fafd resolved: make sure we initialize t->answer_errno before completing the transaction
- a1ba0fbef6 homed: fix log message to honor real homework path
- d6b1e659b3 src/shared/dissect-image.c: fix build without blkdid (#16901)
- e42f9add21 analyze: fix error handling in one case
- 4804ce1488 units: add missing usb-gadget.target
- 5ad4e68c37 man: extend on the usec/sec discrepancy
- 2fb612371d login/logind: Include sys/stat.h for struct stat usage
- 5e884e7ee0 partition/makefs: Include missing sys/file.h header
- 7bbc3807da network: dhcp6: logs only new address
- 2056429e0f Don't run test-repart when loop devices are not available
- dcbea51c5a man: clarify that several networkctl commands takes device names
- 16e4cfcc82 networkctl: label command does not take any argument
- 2352921244 missing: Add new Linux capability
- 8b29c4a4f9 tty-ask-pw-agent: properly propagate error
- f7ce2e9839 tty-ask-pw-agent: the message string might not be set
- 29cba5c9ef tty-ask-pw-agent: make sure "--list" works correctly
- e1ce367d73 add "list" verb to autocompleted commands
- 1f4cb5da1e shell-completion/zsh: add missing verbs for networkctl
- a4236a2764 path: Improve $PATH search directory case
- b7cef386bd path: Skip directories when finalising $PATH search
- 122945f315 rules: don't install 80-drivers.rules when kmod is disabled
- 42fab2d454 zsh: correct journalctl command completion parsing
- ed3f97f962 basic/missing_syscall: fix syscall numbers for arm64 :(
- ba6e7f7c46 shared/install: fix preset operations for non-service instantiated units
- d39f139348 nss-resolve: treat BUS_ERROR_NO_SUCH_UNIT the same as SD_BUS_ERROR_SERVICE_UNKNOWN too
- 9bb3e64d71 various: treat BUS_ERROR_NO_SUCH_UNIT the same as SD_BUS_ERROR_SERVICE_UNKNOWN
- 6d802dd596 man: drop reference to long gone .busname unit type
- a29656804b man: fix a fix of a typo in systemd.service example
- 21ce0f5b33 network: can: Fix CAN initialization
- cab5cde8c9 man: update autogenerated dbus api lists
- 0d8000522b man: fix invalid tag place
- ea94f218be man: add conditionals to more man pages
- ef91325349 meson: add ENABLE_ANALYZE conditional
- 83f7c0a7ec core: add missing conditions/asserts to unit file parsing
- 716718155d analyze: rework condition testing
- 5c4c7581bc sd-bus: fix error handling on readv()
- 6cd058f305 user-runtime-dir: deal gracefully with missing logind properties
- 6a2d73638d shared/seccomp: do not use ifdef guards around textual syscall names
- 7355ac9689 machine-id-setup: don't use KVM or container manager supplied uuid if in chroot env
- 496a71f444 man: Fix typo in systemd-tmpfiles
- 6c5d216ad8 homework: downgrade chattr failure log message
- 1708f06a00 homework: explicitly close cryptsetup context, to not keep loopback device busy
- a21eaa2a3a homework: correct error passed into log message
- 3a2d169f36 homework: sync everything to disk before we rename LUKS loopback file into place
- 84e1ab74d2 homed: downgrade quota message in containers
- 8b62cadf36 analyze-security: do not assign badness to filtered-out syscalls
- 29854a5437 NEWS: clarify two points
- 4cb4fb82f7 meson: add min version for libfdisk
- 76331f86f6 load-fragment: fix grammar in error messages
- 1e53c2d70f Fix function description in logind man page
- 669066564d network: do not fail if UseMTU=yes on DHCP lease lost
- a2a3f16cdc missing_syscall: do not use function name that may conflict with glibc
- 4091dcd469 missing_syscall: fix pidfd_{send_signal,open} numbers for alpha
- 7875daf52b network: wait for previous address removal before configuring static addresses
- 120064b4a1 network: only process non-error message
- f44ec1de15 test: accept that char device 0/0 can now be created witout privileges
- 946e4c43bb tools/make-man-index: fix purpose text that contains tags
- dae0586e91 test-fs-util: skip encrypted path test if we get EACCES
- 0d026c9b0d Newer Glibc use faccessat2 to implement faccessat
- fde6520d46 namespace: fix minor memory leak
- 208ba581f4 man: fix incorrectly placed full stop
- 6c81d57828 man: fix typo
- 53a8d2588e bless-boot: add missing verb to --help
- 4cfa0ac4fd user-record: deal with invalid GECOS fields gracefully
- ae5234ef48 user-util: add mangle_gecos() call for turning strings into fields suitable as GECOS fields
- 972391ac39 fix typo in systemctl help
- 443aacfcda man: clarify that LogNamespace= is for system services only
- 5aec8fe54e _sd-common.h: avoid parsing errors with Coverity
- f9ad4ea2ca analyze: fix 'cat-config systemd/zram-generator.conf'
- dda6fec1df man: describe that changing Storage= does not move existing data
- 2bbd33e476 core: reset bus error before reuse
- b81504a3c7 nspawn: Fix incorrect usage of putenv
- cb263973ac man: fix typo in systemd.service
- 73b432e7ef network: fix DHCPv6 Prefix Delegation example after option rename
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
62e6d73a09870174a891d2a8d29a38e62b05efd5: 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.
