systemd/.git
2 years agoimage-policy: correct two comments
Lennart Poettering [Wed, 26 Apr 2023 19:21:37 +0000 (21:21 +0200)]
image-policy: correct two comments

2 years agoupdate TODO
Lennart Poettering [Wed, 26 Apr 2023 19:23:42 +0000 (21:23 +0200)]
update TODO

2 years agoMerge pull request #27415 from DaanDeMeyer/verity-minimize
Daan De Meyer [Wed, 26 Apr 2023 16:55:51 +0000 (18:55 +0200)]
Merge pull request #27415 from DaanDeMeyer/verity-minimize

repart: Add Minimize= support for verity hash partitions

2 years agoMerge pull request #27419 from yuwata/sd-journal-entry-item
Daan De Meyer [Wed, 26 Apr 2023 16:35:26 +0000 (18:35 +0200)]
Merge pull request #27419 from yuwata/sd-journal-entry-item

sd-journal: skip invalid entry item

2 years agoukify: allow building PE addon
Luca Boccassi [Mon, 17 Apr 2023 23:40:43 +0000 (00:40 +0100)]
ukify: allow building PE addon

Make the kernel optional too, so that we can easily build and sign a PE addon,
that can be used to carry extra command line options.

2 years agoMerge pull request #27398 from yuwata/udev-rule-negative-match
Zbigniew Jędrzejewski-Szmek [Wed, 26 Apr 2023 14:40:01 +0000 (16:40 +0200)]
Merge pull request #27398 from yuwata/udev-rule-negative-match

udev-rule: fix negative match

2 years agoMerge pull request #27411 from yuwata/udev-iocost-follow-ups
Zbigniew Jędrzejewski-Szmek [Wed, 26 Apr 2023 14:37:59 +0000 (16:37 +0200)]
Merge pull request #27411 from yuwata/udev-iocost-follow-ups

udev/iocost: several follow ups

2 years agoMerge pull request #27408 from keszybz/creds-missing-message
Zbigniew Jędrzejewski-Szmek [Wed, 26 Apr 2023 12:57:13 +0000 (14:57 +0200)]
Merge pull request #27408 from keszybz/creds-missing-message

Adjust messages when credentials are missing

2 years agoMerge pull request #26944 from aafeijoo-suse/systemd-network-generator-initrd-fix
Zbigniew Jędrzejewski-Szmek [Wed, 26 Apr 2023 12:55:41 +0000 (14:55 +0200)]
Merge pull request #26944 from aafeijoo-suse/systemd-network-generator-initrd-fix

network-generator: do not parse kernel command line more than once

2 years agotest: tell dfuzzer to skip Reexecute()
Frantisek Sumsal [Wed, 26 Apr 2023 09:05:40 +0000 (11:05 +0200)]
test: tell dfuzzer to skip Reexecute()

As described in systemd/systemd#27204 reexecuting the daemon while
running in a systemd-run "session" causes the session end prematurely.
Let's skip the Reexecute() method in dfuzzer and trigger it manually
until the issue is resolved.

2 years agorepart: Add Minimize= support for verity hash partitions
Daan De Meyer [Wed, 26 Apr 2023 09:52:54 +0000 (11:52 +0200)]
repart: Add Minimize= support for verity hash partitions

Fixes #27414

2 years agorepart: Extend error logging for format_verity_hash/sig()
Daan De Meyer [Wed, 26 Apr 2023 09:14:08 +0000 (11:14 +0200)]
repart: Extend error logging for format_verity_hash/sig()

2 years agosd-journal: make journal_file_copy_entry() return earlier
Yu Watanabe [Wed, 26 Apr 2023 11:54:08 +0000 (20:54 +0900)]
sd-journal: make journal_file_copy_entry() return earlier

2 years agosd-journal: copy boot ID
Yu Watanabe [Wed, 26 Apr 2023 11:37:00 +0000 (20:37 +0900)]
sd-journal: copy boot ID

The pointer to boot ID may be invalidate by journal_file_move_to_object()
calls in the later loop.

2 years agosd-journal: tighten variable scope
Yu Watanabe [Wed, 26 Apr 2023 11:40:08 +0000 (20:40 +0900)]
sd-journal: tighten variable scope

2 years agojournal: Don't try to write garbage if journal entry is corrupted
Daan De Meyer [Wed, 26 Apr 2023 11:21:55 +0000 (13:21 +0200)]
journal: Don't try to write garbage if journal entry is corrupted

If journal_file_data_payload() returns -EBADMSG or -EADDRNOTAVAIL,
we skip the entry and go to the next entry, but we never modify
the number of items that we pass to journal_file_append_entry_internal()
if that happens, which means we could try to append garbage to the
journal file.

Let's keep track of the number of fields we've appended to avoid this
problem.

2 years agorepart: Allow passing target to format_verity_hash()
Daan De Meyer [Wed, 26 Apr 2023 08:16:21 +0000 (10:16 +0200)]
repart: Allow passing target to format_verity_hash()

Let's allow specifying where the verity hash data should be written
as preparation for adding verity hash partition minimize support.

2 years agorepart: Move partition_defer() out of format_verity_hash/sig()
Daan De Meyer [Wed, 26 Apr 2023 08:09:10 +0000 (10:09 +0200)]
repart: Move partition_defer() out of format_verity_hash/sig()

To allow re-using format_verity_hash() for minimizing verity hash
partitions.

2 years agorepart: Turn condition into assert
Daan De Meyer [Wed, 26 Apr 2023 08:04:08 +0000 (10:04 +0200)]
repart: Turn condition into assert

format_verity_hash() should only be called with VERITY_HASH type
partitions, so assert() if that's not the case.

2 years agoudev/iocost: invert DEVTYPE match
Yu Watanabe [Wed, 26 Apr 2023 03:18:40 +0000 (12:18 +0900)]
udev/iocost: invert DEVTYPE match

No functional change, just refactoring.
Addresses https://github.com/systemd/systemd/pull/23325#discussion_r1171006967.

2 years agoudev/iocost: use ID_MODEL_FROM_DATABASE if exists
Yu Watanabe [Wed, 26 Apr 2023 03:05:36 +0000 (12:05 +0900)]
udev/iocost: use ID_MODEL_FROM_DATABASE if exists

To make the rule consistent with 'iocost query'.

2 years agoudev/iocost: fix log message
Yu Watanabe [Wed, 26 Apr 2023 03:26:02 +0000 (12:26 +0900)]
udev/iocost: fix log message

2 years agoudev/iocost: query_named_solution() provides non-NULL model and qos on success
Yu Watanabe [Wed, 26 Apr 2023 03:17:18 +0000 (12:17 +0900)]
udev/iocost: query_named_solution() provides non-NULL model and qos on success

2 years agoudev/iocost: call get_known_solutions() in apply_solution_for_path()
Yu Watanabe [Wed, 26 Apr 2023 02:56:23 +0000 (11:56 +0900)]
udev/iocost: call get_known_solutions() in apply_solution_for_path()

Then, the solution name can be logged.

2 years agoudev: use version()
Yu Watanabe [Tue, 25 Apr 2023 10:52:26 +0000 (19:52 +0900)]
udev: use version()

Fixes #27382.

2 years agoudev/iocost: merge get_known_solutions() and choose_solution()
Yu Watanabe [Wed, 26 Apr 2023 02:34:26 +0000 (11:34 +0900)]
udev/iocost: merge get_known_solutions() and choose_solution()

As these are always called sequentially.
No functional change, just refactoring.

2 years agoudev/iocost: drop unnecessary initializations
Yu Watanabe [Wed, 26 Apr 2023 02:36:28 +0000 (11:36 +0900)]
udev/iocost: drop unnecessary initializations

2 years agoudev/iocost: arg_target_solution is always non-NULL
Yu Watanabe [Wed, 26 Apr 2023 02:19:53 +0000 (11:19 +0900)]
udev/iocost: arg_target_solution is always non-NULL

2 years agoudev/iocost: set default target in parse_config()
Yu Watanabe [Wed, 26 Apr 2023 02:18:42 +0000 (11:18 +0900)]
udev/iocost: set default target in parse_config()

And make the failure in parsing config critical.

2 years agotest: add test case of negative match for SYMLINK and TAG
Yu Watanabe [Tue, 25 Apr 2023 10:14:55 +0000 (19:14 +0900)]
test: add test case of negative match for SYMLINK and TAG

2 years agoudev-rules: fix negative match rule for SYMLINK and TAG
Yu Watanabe [Tue, 25 Apr 2023 10:09:55 +0000 (19:09 +0900)]
udev-rules: fix negative match rule for SYMLINK and TAG

Fixes #27396.

2 years agoportablectl: add --extension to bash completion
Luca Boccassi [Tue, 25 Apr 2023 15:45:06 +0000 (16:45 +0100)]
portablectl: add --extension to bash completion

2 years agoMerge pull request #27409 from mrc0mmand/more-tests
Yu Watanabe [Tue, 25 Apr 2023 23:24:52 +0000 (08:24 +0900)]
Merge pull request #27409 from mrc0mmand/more-tests

test: add a couple of sanity tests for systemd-creds

2 years agotest: add a couple of sanity tests for systemd-creds
Frantisek Sumsal [Tue, 25 Apr 2023 16:32:07 +0000 (18:32 +0200)]
test: add a couple of sanity tests for systemd-creds

2 years agocreds: make --pretty behave in a slightly more expected manner
Frantisek Sumsal [Tue, 25 Apr 2023 10:58:15 +0000 (12:58 +0200)]
creds: make --pretty behave in a slightly more expected manner

2 years agotest: cover missed stuff from securebits-util.h
Frantisek Sumsal [Tue, 18 Apr 2023 10:10:36 +0000 (12:10 +0200)]
test: cover missed stuff from securebits-util.h

2 years agoresolved: adjust message about credentials
Zbigniew Jędrzejewski-Szmek [Tue, 25 Apr 2023 15:59:22 +0000 (17:59 +0200)]
resolved: adjust message about credentials

"credential provided widget" would be better spelled as "credential-provided widget".
But let's adjust the message to name the bad credential explicitly: this
makes it easier to fix for the user.

2 years agoshared/creds-util: return 0 for missing creds in read_credential_strings_many
Zbigniew Jędrzejewski-Szmek [Tue, 25 Apr 2023 15:58:34 +0000 (17:58 +0200)]
shared/creds-util: return 0 for missing creds in read_credential_strings_many

Realistically, the only thing that the caller can do is ignore failures related
to missing credentials. If the caller requires some credentials to be present,
they should just check which output variables are not NULL. One of the callers
was already doing that, and the other wanted to, but missed -ENOENT. By
suppressing -ENOENT and -ENXIO, both callers are simplified.

Fixes a warning at boot:
systemd-vconsole-setup[221]: Failed to import credentials, ignoring: No such file or directory

2 years agoSupport /etc/system-update for OSTree systems
Eric Curtin [Mon, 17 Apr 2023 21:09:24 +0000 (22:09 +0100)]
Support /etc/system-update for OSTree systems

This is required when / is immutable and cannot be written at runtime.

Co-authored-by: Richard Hughes <richard@hughsie.com>
2 years agoMerge pull request #27347 from bluca/sd_bus_nonce
Lennart Poettering [Tue, 25 Apr 2023 15:40:15 +0000 (17:40 +0200)]
Merge pull request #27347 from bluca/sd_bus_nonce

sd: avoid closing sd-bus in a fork, store module-global id for sd-bus/sd-session/sd-journal

2 years agomount-util: split remount_idmap() in two
Lennart Poettering [Tue, 14 Mar 2023 21:55:32 +0000 (22:55 +0100)]
mount-util: split remount_idmap() in two

This will make things a bit longer for now, but more powerful as we can
reuse the userns fd between calls to remount_idmap() if we need to
adjust multiple mounts.

No change in behaviour, just some minor refactoring.

2 years agosd-daemon: add sd_pid_notifyf_with_fds()
Lennart Poettering [Fri, 14 Apr 2023 15:48:47 +0000 (17:48 +0200)]
sd-daemon: add sd_pid_notifyf_with_fds()

I guess it was only a question of time until we need to add the final
frontier of notification functions: one that combines the features of
all the others:

1. specifiying a source PID
2. taking a list of fds to send along
3. accepting a format string for the status string

Hence, let's add it.

2 years agopam: do not attempt to close sd-bus after fork in pam_end()
Luca Boccassi [Thu, 20 Apr 2023 11:55:06 +0000 (12:55 +0100)]
pam: do not attempt to close sd-bus after fork in pam_end()

When pam_end() is called after a fork, and it cleans up caches, it sets
PAM_DATA_SILENT in error_status. FDs will be shared with the parent, so
we do not want to attempt to close them from a child process, or we'll
hit assertions. Complain loudly and skip.

2 years agoman: /usr/lib/systemd/random-seed -> /usr/lib/systemd/systemd-random-seed
Vitaly Kuznetsov [Tue, 25 Apr 2023 14:51:09 +0000 (16:51 +0200)]
man: /usr/lib/systemd/random-seed -> /usr/lib/systemd/systemd-random-seed

/usr/lib/systemd/random-seed is not a thing.

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
2 years agologind: always use 64bit session IDs
Lennart Poettering [Tue, 25 Apr 2023 10:02:32 +0000 (12:02 +0200)]
logind: always use 64bit session IDs

it's a bit confusing that on 32bit systems we'd risk session IDs
overruns like this. Let's expose the same behaviour everywhere and stick
to 64bit ids.

Since we format the ids as strings anyway this doesn't really change
anything performance-wise, it just pushes out collisions by overrun to
basically never happen.

2 years agodocs: fix LoadCredentialEncrypted example (#27387)
Lawrence Thorpe [Tue, 25 Apr 2023 13:41:01 +0000 (14:41 +0100)]
docs: fix LoadCredentialEncrypted example (#27387)

Embedded credential name 'ciphertext.cred' does not match filename 'foobar', refusing.

2 years agosd-login: add SetTTY session object #26611
Thorsten Kukuk [Wed, 19 Apr 2023 14:11:55 +0000 (16:11 +0200)]
sd-login: add SetTTY session object #26611

2 years agodoc: say in CODING_STYLE that AT_EMPTY_PATH should be implied on openat() style APIs...
Lennart Poettering [Tue, 25 Apr 2023 11:56:20 +0000 (13:56 +0200)]
doc: say in CODING_STYLE that AT_EMPTY_PATH should be implied on openat() style APIs (and NULL path is OK)

As discussed here:

https://github.com/systemd/systemd/pull/27397#issuecomment-1521630044

2 years agouser-record-nss: make return values optional
Lennart Poettering [Tue, 14 Mar 2023 16:23:25 +0000 (17:23 +0100)]
user-record-nss: make return values optional

If we only want to know if some user ID/user name is already allocated,
we don't care for the returned data.

2 years agomountpoint-util: make path_get_mnt_id_at() work with a NULL path
Lennart Poettering [Thu, 20 Apr 2023 16:42:36 +0000 (18:42 +0200)]
mountpoint-util: make path_get_mnt_id_at() work with a NULL path

2 years agosd-event: store and compare per-module static origin id
Luca Boccassi [Tue, 25 Apr 2023 00:46:22 +0000 (01:46 +0100)]
sd-event: store and compare per-module static origin id

sd-event objects use hashmaps, which use module-global state, so it is not safe
to pass a sd-event object created by a module instance to another module instance
(e.g.: when two libraries static linking sd-event are pulled in a single process).
Initialize a random per-module origin id and store it in the object, and compare
it when entering a public API, and error out if they don't match, together with
the PID.

2 years agosd-journal: store and compare per-module static origin id
Luca Boccassi [Tue, 25 Apr 2023 00:08:46 +0000 (01:08 +0100)]
sd-journal: store and compare per-module static origin id

sd-journal objects use hashmaps, which use module-global state, so it is not safe
to pass a sd-journal object created by a module instance to another module instance
(e.g.: when two libraries static linking sd-journal are pulled in a single process).
Initialize a random per-module origin id and store it in the object, and compare
it when entering a public API, and error out if they don't match, together with
the PID.

2 years agosd-bus: store and compare per-module static origin id
Luca Boccassi [Mon, 24 Apr 2023 23:56:06 +0000 (00:56 +0100)]
sd-bus: store and compare per-module static origin id

sd-bus objects use hashmaps, which use module-global state, so it is not safe
to pass a sd-bus object created by a module instance to another module instance
(e.g.: when two libraries static linking sd-bus are pulled in a single process).
Initialize a random per-module origin id and store it in the object, and compare
it when entering a public API, and error out if they don't match, together with
the PID.

2 years agomacro: add helper for module origin id
Luca Boccassi [Mon, 24 Apr 2023 23:37:51 +0000 (00:37 +0100)]
macro: add helper for module origin id

These need to be redefined in every module that we need to guard, so add
a macro

2 years agoMerge pull request #27261 from keszybz/test-cleanup
Frantisek Sumsal [Tue, 25 Apr 2023 09:41:27 +0000 (11:41 +0200)]
Merge pull request #27261 from keszybz/test-cleanup

Cleanup syntax and use idiomatic bash in test scripts

2 years agofs-util: make sure open_mkdir_at() does something roughly sensible when invoked with '/'
Lennart Poettering [Thu, 20 Apr 2023 16:44:21 +0000 (18:44 +0200)]
fs-util: make sure open_mkdir_at() does something roughly sensible when invoked with '/'

2 years agoMerge pull request #27380 from poettering/bpf-meson-tweaks
Yu Watanabe [Tue, 25 Apr 2023 09:37:36 +0000 (18:37 +0900)]
Merge pull request #27380 from poettering/bpf-meson-tweaks

two bpf build system changes

2 years agomkosi: Update fedora to release 38
Daan De Meyer [Tue, 25 Apr 2023 08:14:42 +0000 (10:14 +0200)]
mkosi: Update fedora to release 38

2 years agoMerge pull request #27388 from poettering/assert-fd
Lennart Poettering [Tue, 25 Apr 2023 07:54:20 +0000 (09:54 +0200)]
Merge pull request #27388 from poettering/assert-fd

add ASSERT_FD() similar to ASSERT_PTR(), but for fds

2 years agoDrop log level of header limits log message
Daan De Meyer [Mon, 24 Apr 2023 18:55:15 +0000 (20:55 +0200)]
Drop log level of header limits log message

Especially when using in-memory logging, these are too noisy so
let's drop them back to debug level.

2 years agoMerge pull request #27386 from dtardon/test-cleanup
Luca Boccassi [Tue, 25 Apr 2023 01:00:56 +0000 (02:00 +0100)]
Merge pull request #27386 from dtardon/test-cleanup

More automatic cleanup in tests

2 years agocryptsetup-fido2: Depend on libcryptsetup
Wolfgang Müller [Mon, 24 Apr 2023 18:00:56 +0000 (20:00 +0200)]
cryptsetup-fido2: Depend on libcryptsetup

crypsetup-fido2 always depended on both libfido2 and libcryptsetup, but
0a8e026e825dda142a8f1552a4b45815cbfd0b48 forgot to make the then
implicit dependency on libcryptsetup explicit when moving it from
cryptsetup/ to shared/. This breaks builds when libfido2 is autodetected
but the system is missing libcryptsetup.

Introduce an explicit check for HAVE_LIBCRYPTSETUP such that
cryptsetup-fido2 is only built when both libraries are available.

Fixes #27374.

2 years agosd-bus: check for pid change before closing
Luca Boccassi [Thu, 20 Apr 2023 00:24:42 +0000 (01:24 +0100)]
sd-bus: check for pid change before closing

If we try to close after a fork, the FDs will have been cloned
too and we'll assert. This can happen for example in PAM modules.

Avoid the macro and define ref/unref by hand to do the same check.

2 years agohomed: rename make_userns() to avoid name conflict with mount-util.[ch]
Lennart Poettering [Tue, 14 Mar 2023 21:48:25 +0000 (22:48 +0100)]
homed: rename make_userns() to avoid name conflict with mount-util.[ch]

This doesn't really matter too much as both are static functions. But
it's confusing as hell both when debugging and reading code, given that
homed actually uses mount-util.c

Hence, let's just rename one of the two, to minimize confusion.

No actual change in behaviour.

(and sooner or later we might want to export mount-util.c's version of
the function, since it's generically useful)

2 years agoMerge pull request #27113 from keszybz/variable-expansion-rework
Zbigniew Jędrzejewski-Szmek [Mon, 24 Apr 2023 20:03:06 +0000 (22:03 +0200)]
Merge pull request #27113 from keszybz/variable-expansion-rework

Rework serialization of command lines in pid1 and make run not expand variables

2 years agotest: use idiomatic bash loop iteration
Zbigniew Jędrzejewski-Szmek [Fri, 7 Apr 2023 08:17:15 +0000 (10:17 +0200)]
test: use idiomatic bash loop iteration

In a few cases, also avoid a sleep in the last (failed) iteration of the loop.
It doesn't matter too much, but it's still ugly.

2 years agotestsuite-54: drop unnecessary pipe
Zbigniew Jędrzejewski-Szmek [Wed, 5 Apr 2023 13:52:16 +0000 (15:52 +0200)]
testsuite-54: drop unnecessary pipe

2 years agotestsuite-70: drop unnecessary env
Zbigniew Jędrzejewski-Szmek [Wed, 5 Apr 2023 13:51:56 +0000 (15:51 +0200)]
testsuite-70: drop unnecessary env

2 years agotest: drop uses of "&& { echo 'unexpected success'; exit 1; }"
Zbigniew Jędrzejewski-Szmek [Wed, 5 Apr 2023 13:50:42 +0000 (15:50 +0200)]
test: drop uses of "&& { echo 'unexpected success'; exit 1; }"

Brief is sweet.

2 years agoparse-util: allow parse_pid() to work with NULL return parameter
Lennart Poettering [Thu, 20 Apr 2023 16:46:55 +0000 (18:46 +0200)]
parse-util: allow parse_pid() to work with NULL return parameter

That way the function becomes useful for validating pids formatted as
strings.

2 years agotest-hashmap-plain: use _cleanup_
David Tardon [Mon, 24 Apr 2023 18:58:19 +0000 (20:58 +0200)]
test-hashmap-plain: use _cleanup_

2 years agotest-set: use _cleanup_
David Tardon [Mon, 24 Apr 2023 18:48:33 +0000 (20:48 +0200)]
test-set: use _cleanup_

2 years agoloop-util: port some code over to ASSERT_FD()
Lennart Poettering [Mon, 24 Apr 2023 16:58:57 +0000 (18:58 +0200)]
loop-util: port some code over to ASSERT_FD()

2 years agofd-util: add ASSERT_FD() that is similar to ASSERT_PTR() but for fds
Lennart Poettering [Thu, 20 Apr 2023 08:10:35 +0000 (10:10 +0200)]
fd-util: add ASSERT_FD() that is similar to ASSERT_PTR() but for fds

2 years agotest-calendarspec: use _cleanup_
David Tardon [Mon, 24 Apr 2023 18:44:29 +0000 (20:44 +0200)]
test-calendarspec: use _cleanup_

2 years agomkosi: Update to latest
Daan De Meyer [Mon, 24 Apr 2023 11:21:21 +0000 (13:21 +0200)]
mkosi: Update to latest

This pulls in a fix for Debian rpmdb locations, which results in a
substantial speedup for centos/fedora builds.

2 years agonspawn: Don't follow /etc/resolv.conf symlinks
Daan De Meyer [Mon, 24 Apr 2023 09:54:50 +0000 (11:54 +0200)]
nspawn: Don't follow /etc/resolv.conf symlinks

When we're checking if /etc/resolv.conf exists so we can bind mount
on top of it, we care about whether the symlink itself exists if
/etc/resolv.conf exists and not the file it points to, so add
CHASE_NOFOLLOW to make sure we check existence of the symlink and
not the file it points to.

2 years agopid1: simplify bpf meson import
Lennart Poettering [Thu, 16 Mar 2023 14:37:04 +0000 (15:37 +0100)]
pid1: simplify bpf meson import

2 years agomeson: move bpf hookup into main meson build file
Lennart Poettering [Thu, 16 Mar 2023 14:36:26 +0000 (15:36 +0100)]
meson: move bpf hookup into main meson build file

This way we can use it in systemd-userdbd later on, too.

2 years agoman: fix LogControl1 manpage example
Luca Boccassi [Mon, 24 Apr 2023 12:42:16 +0000 (13:42 +0100)]
man: fix LogControl1 manpage example

Follow-up for c6b8fffdfaf1f7c9a1dac73e1e54993a06c766c0

2 years agopam: cache sd-bus separately per module
Luca Boccassi [Sun, 16 Apr 2023 13:55:09 +0000 (14:55 +0100)]
pam: cache sd-bus separately per module

sd-bus connection is cached by the two pam modules globally, but this
can lead to issues due to hashmaps (used by sd-bus) using a global
static variable for the shared hash key, which is different per module
as both modules are loaded in the same process.

This happens because the sd-bus object is create in one module, but
used in the other, so global state does not match.

Use a different pam cache identifier for the sd-bus pointer, so that
each module uses a different sd-bus connection as a workaround.

Fixes https://github.com/systemd/systemd/issues/27216
Fixes https://github.com/systemd/systemd/issues/17266

2 years agopam_systemd_home: clean up sd-bus when called about something else's user
Luca Boccassi [Thu, 20 Apr 2023 11:58:18 +0000 (12:58 +0100)]
pam_systemd_home: clean up sd-bus when called about something else's user

acquire_home() takes a reference to a sd-bus object, which the open_session
hook cleans on success. But only when handling a user actually owned by homed,
it did not clean it up when skipping because it is being invoked on a system
user.
We need to be careful with sd-bus here as pam_sm_open_session is the last
hook before forking, and we want to clean up sd-bus before that happens, or
we'll have a broken reference (FDs are cloexec) in the child process, which
will then assert when attempting to close them, or leak the bus connection
which causes dbus to complain loudly:

 dbus-daemon[62]: [system] Connection has not authenticated soon enough, closing it (auth_timeout=30000ms, elapsed: 30020ms)

2 years agoMerge pull request #27367 from bluca/mkosi_resolve
Daan De Meyer [Mon, 24 Apr 2023 11:03:58 +0000 (13:03 +0200)]
Merge pull request #27367 from bluca/mkosi_resolve

mkosi: add tmpfiles to handle locale/resolve.conf in Debian

2 years agoMerge pull request #27357 from bluca/example_logcontrol
Zbigniew Jędrzejewski-Szmek [Mon, 24 Apr 2023 10:24:36 +0000 (12:24 +0200)]
Merge pull request #27357 from bluca/example_logcontrol

man: add working example to LogControl1 manpage

2 years agostub: add comment on measurement of io.systemd.stub.kernel-cmdline-extra
Luca Boccassi [Sun, 23 Apr 2023 17:33:24 +0000 (18:33 +0100)]
stub: add comment on measurement of io.systemd.stub.kernel-cmdline-extra

2 years agomkosi: add tmpfiles to create debian/ubuntu /etc/default/locale link
Luca Boccassi [Mon, 24 Apr 2023 09:47:29 +0000 (10:47 +0100)]
mkosi: add tmpfiles to create debian/ubuntu /etc/default/locale link

2 years agomkosi: move debian/ubuntu ignore preset to config directory
Luca Boccassi [Mon, 24 Apr 2023 09:46:39 +0000 (10:46 +0100)]
mkosi: move debian/ubuntu ignore preset to config directory

2 years agomkosi: move debian/ubuntu common conf under common directory
Luca Boccassi [Sun, 23 Apr 2023 11:54:20 +0000 (12:54 +0100)]
mkosi: move debian/ubuntu common conf under common directory

2 years agomkosi: delete /etc/resolv.conf to let tmpfiles handle it
Luca Boccassi [Sun, 23 Apr 2023 12:02:06 +0000 (13:02 +0100)]
mkosi: delete /etc/resolv.conf to let tmpfiles handle it

In case the distribution creates or ships resolv.conf, delete it and let tmpfiles handle it

2 years agomkosi: Update to latest
Daan De Meyer [Sun, 23 Apr 2023 12:53:11 +0000 (14:53 +0200)]
mkosi: Update to latest

Let's use the new support for matching against any distribution in
a list of distributions to start sharing most things between the
ubuntu/debian configs and centos/fedora configs.

2 years agotestsuite-04: remove unnecessary conditional
Zbigniew Jędrzejewski-Szmek [Tue, 4 Apr 2023 09:01:33 +0000 (11:01 +0200)]
testsuite-04: remove unnecessary conditional

2 years agotestsuite-04: remove redirection, drop whitespace after redirection op
Zbigniew Jędrzejewski-Szmek [Tue, 4 Apr 2023 08:58:34 +0000 (10:58 +0200)]
testsuite-04: remove redirection, drop whitespace after redirection op

2 years agorun: expand variables also with --scope
Zbigniew Jędrzejewski-Szmek [Tue, 4 Apr 2023 19:18:33 +0000 (21:18 +0200)]
run: expand variables also with --scope

This makes syntax be the same for commands which are started by the manager and
those which are spawned directly (when --scope is used).

Before:
$ systemd-run -q -t echo '$TERM'
xterm-256color

$ systemd-run -q --scope echo '$TERM'
$TERM

Now:
$ systemd-run -q --scope echo '$TERM'
xterm-256color

Previous behaviour can be restored via --expand-environment=no:
$ systemd-run -q --scope --expand-environment=no echo '$TERM'
$TERM

Fixes #22948.

At some level, this is a compat break. Fortunately --scope is not very widely
used, so I think we can get away with this. Having different syntax depending
on whether --scope was used or not was bad UX.

A NEWS entry will be required.

2 years agoman/systemd-run: add examples explaining how variable expansion is performed
Zbigniew Jędrzejewski-Szmek [Mon, 3 Apr 2023 06:26:56 +0000 (08:26 +0200)]
man/systemd-run: add examples explaining how variable expansion is performed

2 years agorun: add --expand-environment=no to disable server-side envvar expansion
Zbigniew Jędrzejewski-Szmek [Sun, 2 Apr 2023 21:17:58 +0000 (23:17 +0200)]
run: add --expand-environment=no to disable server-side envvar expansion

This uses StartExecEx to get the equivalent of ExecStart=:. StartExecEx was
added in b3d593673c5b8b0b7d781fd26ab2062ca6e7dbdb, so this will not work with
older systemds.

A hint is emitted if we get an error indicating lack of support. PID1 returns
SD_BUS_ERROR_PROPERTY_READ_ONLY, but I'm checking for
SD_BUS_ERROR_UNKNOWN_PROPERTY too for safety.

2 years agorun: split out creation of unit creation messages
Zbigniew Jędrzejewski-Szmek [Sun, 2 Apr 2023 20:27:58 +0000 (22:27 +0200)]
run: split out creation of unit creation messages

Just refactoring, in preparation for future changes.
(Though I think it'd be reasonable to do anyway, those functions were
awfully long.)

'git diff' displays this badly. The middle part of start_transient_service()
is moved to make_transient_service_unit(), and the middle part of
start_transient_trigger() is moved to make_transient_trigger_unit().

2 years agorun: simplify returning of status
Zbigniew Jędrzejewski-Szmek [Sun, 2 Apr 2023 19:50:19 +0000 (21:50 +0200)]
run: simplify returning of status

start_transient_service() would return two ints: one normally and one via
*retval. We can just return one int and propagate it directly, because we
use DEFINE_MAIN_FUNCTION_WITH_POSITIVE_FAILURE().

2 years agocore: fix writing of ExecStartEx and friends
Zbigniew Jędrzejewski-Szmek [Mon, 3 Apr 2023 11:56:18 +0000 (13:56 +0200)]
core: fix writing of ExecStartEx and friends

The property name is called ExecStartEx, but we have to write it as ExecStart=
in the unit file. :(
Bug introduced in b3d593673c5b8b0b7d781fd26ab2062ca6e7dbdb when ex-properties
were initially added.

In addition, we cannot escape $ as $$, because when ":" is used, we wouldn't
unescape $$ back to $.

2 years agocore/unit: add UNIT_ESCAPE_EXEC_SYNTAX
Zbigniew Jędrzejewski-Szmek [Mon, 3 Apr 2023 12:45:46 +0000 (14:45 +0200)]
core/unit: add UNIT_ESCAPE_EXEC_SYNTAX

Unfortunately we can't escape $ when ':' is used to prohibit variable expansion:
  ExecStart=:echo $$
is not the same as
  ExecStart=:echo $

This just adds the functionality and the unittests, without using it anywhere
for real yet.

2 years agocore/unit: rename UNIT_ESCAPE_EXEC_SYNTAX → *_ENV
Zbigniew Jędrzejewski-Szmek [Mon, 3 Apr 2023 12:50:12 +0000 (14:50 +0200)]
core/unit: rename UNIT_ESCAPE_EXEC_SYNTAX → *_ENV

In preparation for future changes.