Lennart Poettering [Mon, 2 Oct 2017 08:50:07 +0000 (10:50 +0200)]
core: fix StateDirectory= (and friends) safety checks when decoding transient unit properties
Let's make sure relative directories such as "foo/bar" are accepted, by
using the same validation checks as in unit file parsing.
Lennart Poettering [Thu, 28 Sep 2017 21:41:06 +0000 (23:41 +0200)]
test: add test for DynamicUser= + StateDirectory=
Also, tests for DynamicUser= should really run for system mode, as we
allocate from a system resource.
(This also increases the test timeout to 2min. If one of our tests
really hangs then waiting for 2min longer doesn't hurt either. The old
2s is really short, given that we run in potentially slow VM
environments for this test. This becomes noticable when the slow "find"
command this adds is triggered)
Lennart Poettering [Thu, 28 Sep 2017 18:33:38 +0000 (20:33 +0200)]
core: pass the correct error to the caller
Lennart Poettering [Thu, 28 Sep 2017 18:28:09 +0000 (20:28 +0200)]
core: when looking for a UID to use for a dynamic UID start with the current owner of the StateDirectory= and friends
Let's optimize dynamic UID allocation a bit: if a StateDirectory= (or
suchlike) is configured, we start our allocation loop from that UID and
use it if it currently isn't used otherwise. This is beneficial as it
saves us from having to expensively recursively chown() these
directories in the typical case (which StateDirectory= does when it
notices that the owner of the directory doesn't match the UID picked).
With this in place we now have the a three-phase logic for allocating a
dynamic UID:
a) first, we try to use the owning UID of StateDirectory=,
CacheDirectory=, LogDirectory= if that exists and is currently
otherwise unused.
b) if that didn't work out, we hash the UID from the service name
c) if that didn't yield an unused UID either, randomly pick new ones
until we find a free one.
Lennart Poettering [Thu, 28 Sep 2017 17:14:10 +0000 (19:14 +0200)]
man: document the new logic
Lennart Poettering [Thu, 28 Sep 2017 16:55:45 +0000 (18:55 +0200)]
execute: make StateDirectory= and friends compatible with DynamicUser=1 and RootDirectory=/RootImage=
Let's clean up the interaction of StateDirectory= (and friends) to
DynamicUser=1: instead of creating these directories directly below
/var/lib, place them in /var/lib/private instead if DynamicUser=1 is
set, making that directory 0700 and owned by root:root. This way, if a
dynamic UID is later reused, access to the old run's state directory is
prohibited for that user. Then, use file system namespacing inside the
service to make /var/lib/private a readable tmpfs, hiding all state
directories that are not listed in StateDirectory=, and making access to
the actual state directory possible. Mount all directories listed in
StateDirectory= to the same places inside the service (which means
they'll now be mounted into the tmpfs instance). Finally, add a symlink
from the state directory name in /var/lib/ to the one in
/var/lib/private, so that both the host and the service can access the
path under the same location.
Here's an example: let's say a service runs with StateDirectory=foo.
When DynamicUser=0 is set, it will get the following setup, and no
difference between what the unit and what the host sees:
/var/lib/foo (created as directory)
Now, if DynamicUser=1 is set, we'll instead get this on the host:
/var/lib/private (created as directory with mode 0700, root:root)
/var/lib/private/foo (created as directory)
/var/lib/foo → private/foo (created as symlink)
And from inside the unit:
/var/lib/private (a tmpfs mount with mode 0755, root:root)
/var/lib/private/foo (bind mounted from the host)
/var/lib/foo → private/foo (the same symlink as above)
This takes inspiration from how container trees are protected below
/var/lib/machines: they generally reuse UIDs/GIDs of the host, but
because /var/lib/machines itself is set to 0700 host users cannot access
files in the container tree even if the UIDs/GIDs are reused. However,
for this commit we add one further trick: inside and outside of the unit
/var/lib/private is a different thing: outside it is a plain,
inaccessible directory, and inside it is a world-readable tmpfs mount
with only the whitelisted subdirs below it, bind mounte din. This
means, from the outside the dir acts as an access barrier, but from the
inside it does not. And the symlink created in /var/lib/foo itself
points across the barrier in both cases, so that root and the unit's
user always have access to these dirs without knowing the details of
this mounting magic.
This logic resolves a major shortcoming of DynamicUser=1 units:
previously they couldn't safely store persistant data. With this change
they can have their own private state, log and data directories, which
they can write to, but which are protected from UID recycling.
With this change, if RootDirectory= or RootImage= are used it is ensured
that the specified state/log/cache directories are always mounted in
from the host. This change of semantics I think is much preferable since
this means the root directory/image logic can be used easily for
read-only resource bundling (as all writable data resides outside of the
image). Note that this is a change of behaviour, but given that we
haven't released any systemd version with StateDirectory= and friends
implemented this should be a safe change to make (in particular as
previously it wasn't clear what would actually happen when used in
combination). Moreover, by making this change we can later add a "+"
modifier to these setings too working similar to the same modifier in
ReadOnlyPaths= and friends, making specified paths relative to the
container itself.
Lennart Poettering [Thu, 28 Sep 2017 16:35:51 +0000 (18:35 +0200)]
namespace: if we can create the destination of bind and PrivateTmp= mounts
When putting together the namespace, always create the file or directory
we are supposed to bind mount on, the same way we do it for most other
stuff, for example mount units or systemd-nspawn's --bind= option.
This has the big benefit that we can use namespace bind mounts on dirs
in /tmp or /var/tmp even in conjunction with PrivateTmp=.
Lennart Poettering [Thu, 28 Sep 2017 16:30:55 +0000 (18:30 +0200)]
namespace: properly handle bind mounts from the host
Before this patch we had an ordering problem: if we have no namespacing
enabled except for two bind mounts that intend to swap /a and /b via
bind mounts, then we'd execute the bind mount binding /b to /a, followed
by thebind mount from /a to /b, thus having the effect that /b is now
visible in both /a and /b, which was not intended.
With this change, as soon as any bind mount is configured we'll put
together the service mount namespace in a temporary directory instead of
operating directly in the root. This solves the problem in a
straightforward fashion: the source of bind mounts will always refer to
the host, and thus be unaffected from the bind mounts we already
created.
Lennart Poettering [Thu, 28 Sep 2017 16:28:23 +0000 (18:28 +0200)]
namespace: create /dev, /proc, /sys when needed
We already create /dev implicitly if PrivateTmp=yes is on, if it is
missing. Do so too for the other two API VFS, as well as for /dev if
PrivateTmp=yes is off but MountAPIVFS=yes is on (i.e. when /dev is bind
mounted from the host).
Lennart Poettering [Thu, 28 Sep 2017 14:58:43 +0000 (16:58 +0200)]
core: usually our enum's _INVALID and _MAX special values are named after the full type
In most cases we followed the rule that the special _INVALID and _MAX
values we use in our enums use the full type name as prefix (in contrast
to regular values that we often make shorter), do so for
ExecDirectoryType as well.
No functional changes, just a little bit of renaming to make this code
more like the rest.
Lennart Poettering [Thu, 28 Sep 2017 17:13:44 +0000 (19:13 +0200)]
core: chown() StateDirectory= and friends recursively when starting a service
This is particularly useful when used in conjunction with DynamicUser=1,
where the UID might change for every invocation, but is useful in other
cases too, for example, when these directories are shared between
systems where the UID assignments differ slightly.
Lennart Poettering [Thu, 28 Sep 2017 11:01:33 +0000 (13:01 +0200)]
nspawn: properly report all kinds of changed UID/GID when patching things for userns
We forgot to propagate one chmod().
Lennart Poettering [Mon, 2 Oct 2017 15:12:58 +0000 (17:12 +0200)]
Merge pull request #6960 from keszybz/hwdb-update
Hwdb update and sorting
Jouke Witteveen [Mon, 2 Oct 2017 14:35:27 +0000 (16:35 +0200)]
service: better detect when a Type=notify service cannot become active anymore (#6959)
No need to wait for a timeout when we know things are not going to work out.
When the main process goes away and only notifications from the main process are
accepted, then we will not receive any notifications anymore.
Zbigniew Jędrzejewski-Szmek [Mon, 2 Oct 2017 13:08:10 +0000 (15:08 +0200)]
Merge pull request #6941 from andir/use-in_set
use IN_SET where possible
Zbigniew Jędrzejewski-Szmek [Mon, 2 Oct 2017 12:52:12 +0000 (14:52 +0200)]
Minor line wrapping adjustment
Zbigniew Jędrzejewski-Szmek [Mon, 2 Oct 2017 12:40:10 +0000 (14:40 +0200)]
Merge pull request #6932 from poettering/notify-pam
fix handling of cgroup empty events for Type=notify services
Zbigniew Jędrzejewski-Szmek [Mon, 2 Oct 2017 11:19:23 +0000 (13:19 +0200)]
hwdb: sort usb classes and vendors
No change, but let's keep the sorting in place as a safeguard for
the future.
Zbigniew Jędrzejewski-Szmek [Mon, 2 Oct 2017 11:19:23 +0000 (13:19 +0200)]
hwdb: sort pci classes and vendors
No change, but let's keep the sorting in place as a safeguard for
the future.
Zbigniew Jędrzejewski-Szmek [Mon, 2 Oct 2017 11:19:23 +0000 (13:19 +0200)]
hwdb: sort sdio entries
Nothing intersting here.
Zbigniew Jędrzejewski-Szmek [Mon, 2 Oct 2017 11:19:23 +0000 (13:19 +0200)]
hwdb: de-duplicate and sort OUI entries
Ignoring duplicate entry: 0001C8 = "THOMAS CONRAD CORP.", "CONRAD CORP."
Ignoring duplicate entry: 080030 = "NETWORK RESEARCH CORPORATION", "ROYAL MELBOURNE INST OF TECH"
Ignoring duplicate entry: 080030 = "NETWORK RESEARCH CORPORATION", "CERN"
→ we have two vendor prefixes with duplicate entries. For the first one,
there are two entries with what appear to be the same company. In the
second case, the same prefix is assigned to three different entities.
I arbitrarily chose to prefer the first entry.
Zbigniew Jędrzejewski-Szmek [Mon, 2 Oct 2017 11:19:22 +0000 (13:19 +0200)]
ids_parser: allow specifying which parts to run
Zbigniew Jędrzejewski-Szmek [Mon, 2 Oct 2017 11:19:22 +0000 (13:19 +0200)]
hwdb: add a grammar-based generator for vendor/model and class tables
This is rather slow (1 m 45 s on my laptop), but since it'd be only used
once per release, maybe this doesn't matter that much.
Output is identical to ids-update.pl with the set of source files committed in
the grandparent.
Zbigniew Jędrzejewski-Szmek [Mon, 2 Oct 2017 11:19:22 +0000 (13:19 +0200)]
hwdb: fix invalid encoding in usb.ids
0xB4 is the code point for "accent acute", but when encoded in utf-8,
is is a multibyte sequence. A single 0xB4 byte is invalid (seems to be
latin1).
Zbigniew Jędrzejewski-Szmek [Mon, 2 Oct 2017 11:19:22 +0000 (13:19 +0200)]
hwdb: also add the source files to git
Without the original files it's hard to see what changed "upstream", and what
entries were added and removed. Upstream did not keep the entries sorted, and
our processing scripts did not sort the output either, so from just looking at
diffs it's hard to say what changed. So let's keep the original data, at least
for a few update cycles, so get a better handle on the upstream changes.
It's a few hundred kilobytes, so not that big, and text, so it should
compresses well.
Zbigniew Jędrzejewski-Szmek [Mon, 2 Oct 2017 11:19:21 +0000 (13:19 +0200)]
hwdb: update
http://www.uefi.org/uefi-pnp-export is returning an internal server error,
so the previous version was used.
Zbigniew Jędrzejewski-Szmek [Mon, 2 Oct 2017 11:19:21 +0000 (13:19 +0200)]
meson-hwdb-update.sh: add -n param to skip downloads
Useful to experiment with the patching part w/o redownloading the files.
Zbigniew Jędrzejewski-Szmek [Mon, 2 Oct 2017 11:19:21 +0000 (13:19 +0200)]
meson: rename hwdb update target
ninja -c build hwdb-update
During the initial meson conversion, custom_target:s and run_target:s behaved
the same, and the target name became a top-level command. Now custom_target:s
require the subdir to be included, e.g. we have man/man target to build man pages,
but run_target:s not. So I think this target got a name that is so generic because
of the confusion caused by changing rules. Let's rename it.
Andreas Rammhold [Fri, 29 Sep 2017 07:58:22 +0000 (09:58 +0200)]
tree-wide: use `!IN_SET(..)` for `a != b && a != c && …`
The included cocci was used to generate the changes.
Thanks to @flo-wer for pointing this case out.
Andreas Rammhold [Thu, 28 Sep 2017 22:37:23 +0000 (00:37 +0200)]
tree-wide: use IN_SET where possible
In addition to the changes from #6933 this handles cases that could be
matched with the included cocci file.
Lennart Poettering [Fri, 29 Sep 2017 14:56:51 +0000 (16:56 +0200)]
man: document that PAMName= and NotifyAccess=all don't mix well.
See: #6045
Lennart Poettering [Fri, 29 Sep 2017 14:41:34 +0000 (16:41 +0200)]
service: accept the fact that the three xyz_good() functions return ints
Currently, all three of cgroup_good(), main_pid_good(),
control_pid_good() all return an "int" (two of them propagate errors).
It's a good thing to keep the three functions similar, so let's leave it
at that, but then let's clean up the invocation of the three functions
so that they always clearly acknowledge that the return value is not a
bool, but potentially negative.
Lennart Poettering [Fri, 29 Sep 2017 14:39:46 +0000 (16:39 +0200)]
service: drop _pure_ decorator on static function
The compiler should be good enough to figure this out on its own if this
is a static function, and it makes control_pid_good() an outlier anyway,
and decorators like this tend to bitrot. Hence, to keep things simple
and automatic, let's just drop the decorator.
Lennart Poettering [Wed, 27 Sep 2017 17:56:57 +0000 (19:56 +0200)]
service: a cgroup empty notification isn't reason enough to go down
The processes associated with a service are not just the ones in its
cgroup, but also the control and main processes, which might possibly
live outside of it, for example if they transitioned into their own
cgroups because they registered a PAM session of their own. Hence, if we
get a cgroup empty notification always check if the main PID is still
around before taking action too eagerly.
Fixes: #6045
Lennart Poettering [Mon, 2 Oct 2017 10:57:03 +0000 (12:57 +0200)]
service: add explanatory comments to control_pid_good() and cgroup_good()
Let's add a similar comment to each as we already have for
main_pid_good(), emphasizing that these functions are supposed to be
have very similar.
Lennart Poettering [Wed, 27 Sep 2017 17:56:36 +0000 (19:56 +0200)]
service: fix main_pid_good() comment
We don't actually return -1, don't claim that.
Piotr Drąg [Sat, 30 Sep 2017 12:39:29 +0000 (14:39 +0200)]
catalog: update Polish translation (#6947)
Lennart Poettering [Fri, 29 Sep 2017 13:48:23 +0000 (15:48 +0200)]
Merge pull request #6942 from keszybz/remove-sys
Remove sys if necessary
Zbigniew Jędrzejewski-Szmek [Fri, 29 Sep 2017 10:28:25 +0000 (12:28 +0200)]
sys-script: remove output directory if it exists
meson will occasionally call us even though the output directory
exists. Let's just nuke and recreate in that case.
Zbigniew Jędrzejewski-Szmek [Fri, 29 Sep 2017 10:27:21 +0000 (12:27 +0200)]
create-sys-script: adapt to separate build dir, modernize, add more checks
The script wasn't apparently used since the switch to meson, because
it required the sys subdirectory to be present in the same subdirectory
where the output script is located.
Let's use f-strings to make the whole thing more readable. Add some
extra checks.
John Lin [Thu, 28 Sep 2017 17:56:50 +0000 (01:56 +0800)]
man: move non-target units together (#6934)
Zbigniew Jędrzejewski-Szmek [Thu, 28 Sep 2017 17:24:16 +0000 (19:24 +0200)]
meson: move library version defines to the top (#6939)
Lennart Poettering [Thu, 28 Sep 2017 17:22:55 +0000 (19:22 +0200)]
Merge pull request #6936 from poettering/news-235
News 235
Lennart Poettering [Thu, 28 Sep 2017 17:22:09 +0000 (19:22 +0200)]
Merge pull request #6933 from yuwata/use_in_set
use IN_SET macro
Lennart Poettering [Thu, 28 Sep 2017 09:29:52 +0000 (11:29 +0200)]
meson: bump release to 235
Lennart Poettering [Thu, 28 Sep 2017 09:26:11 +0000 (11:26 +0200)]
add some more things to TODO
Lennart Poettering [Thu, 28 Sep 2017 09:26:02 +0000 (11:26 +0200)]
prepare NEWS for 235
Yu Watanabe [Thu, 28 Sep 2017 08:17:04 +0000 (17:17 +0900)]
libsystemd: use IN_SET macro
Lennart Poettering [Thu, 28 Sep 2017 07:46:03 +0000 (09:46 +0200)]
Merge pull request #6924 from andir/vrf-dhcpv4
networkd: use VRFs routing table for DHCP routes
Franck Bui [Thu, 28 Sep 2017 06:53:46 +0000 (08:53 +0200)]
udev-rules: all values can contain escaped double quotes now (#6890)
This is primarly useful to support escaped double quotes in PROGRAM or
IMPORT{program} directives.
The only possibilty before this patch was to use an external shell script but
this seems too cumbersome for trivial logics such as
PROGRAM=="/bin/sh -c 'FOO=\"%s{model}\"; echo ${FOO:0:4}'"
or any similar shell constructs that needs to deals with patterns including
whitespaces.
As it's the case for single quote and for directives running a program, words
within escaped double quotes will be considered as a single argument.
Fixes: #6835
Zbigniew Jędrzejewski-Szmek [Thu, 28 Sep 2017 06:48:21 +0000 (08:48 +0200)]
Merge pull request #6928 from poettering/cgroup-empty-race
rework cgroup empty notification handling (i.e. a fix for #6608)
Yu Watanabe [Thu, 28 Sep 2017 06:38:50 +0000 (15:38 +0900)]
networkd: use assert_not_reached()
Yu Watanabe [Thu, 28 Sep 2017 06:37:38 +0000 (15:37 +0900)]
networkd: use IN_SET macro
Andreas Rammhold [Tue, 26 Sep 2017 23:54:20 +0000 (01:54 +0200)]
man/systemd.network: Updated documentation about VRF traffic redirection
Starting with kernel version 4.8 the kernel has a single `l3mdev` rule
that handles this. This rule will be created when the first VRF device
is added.
Andreas Rammhold [Tue, 26 Sep 2017 23:52:07 +0000 (01:52 +0200)]
man/systemd.network: Added documentation about the DHCP.RouteTable behaviour with VRFs
Andreas Rammhold [Thu, 7 Sep 2017 09:08:39 +0000 (11:08 +0200)]
networkd: use VRFs routing table for DHCP routes
When an interface has been enslaved to a VRF the received routes should
be added to the VRFs RT instead of the main table.
This change modifies the default behaviour of routes in the case where a
network belongs to an VRF. When the user does not configure a
`DHCP.RouteTable` in a `systemd.network` file and the interface belongs
to a VRF, the VRFs routing table is used instead of RT_TABLE_MAIN.
When the user has configured a custom routing table for DHCP the VRFs
table is ignored and the users preference takes precedence.
Zbigniew Jędrzejewski-Szmek [Wed, 27 Sep 2017 17:37:25 +0000 (19:37 +0200)]
Merge pull request #6922 from poettering/symlink-sockets
Fixes for Symlinks= handling in socket units
Lennart Poettering [Tue, 26 Sep 2017 21:35:58 +0000 (23:35 +0200)]
core: log unit failure with type-specific result code
This slightly changes how we log about failures. Previously,
service_enter_dead() would log that a service unit failed along with its
result code, and unit_notify() would do this again but without the
result code. For other unit types only the latter would take effect.
This cleans this up: we keep the message in unit_notify() only for debug
purposes, and add type-specific log lines to all our unit types that can
fail, and always place them before unit_notify() is invoked.
Or in other words: the duplicate log message for service units is
removed, and all other unit types get a more useful line with the
precise result code.
Lennart Poettering [Tue, 26 Sep 2017 20:49:23 +0000 (22:49 +0200)]
core: free_and_strdup() FTW!
Lennart Poettering [Tue, 26 Sep 2017 20:49:09 +0000 (22:49 +0200)]
cgroup: IN_SET() FTW!
Lennart Poettering [Tue, 26 Sep 2017 20:43:08 +0000 (22:43 +0200)]
cgroup: after determining that a cgroup is empty, asynchronously dispatch this
This makes sure that if we learn via inotify or another event source
that a cgroup is empty, and we checked that this is indeed the case (as
we might get spurious notifications through inotify, as the inotify
logic through the "cgroups.event" is pretty unspecific and might be
trigger for a variety of reasons), then we'll enqueue a defer event for
it, at a priority lower than SIGCHLD handling, so that we know for sure
that if there's waitid() data for a process we used it before
considering the cgroup empty notification.
Fixes: #6608
Lennart Poettering [Tue, 26 Sep 2017 20:15:02 +0000 (22:15 +0200)]
core: rename cgroup_queue → cgroup_realize_queue
We are about to add second cgroup-related queue, called
"cgroup_empty_queue", hence let's rename "cgroup_queue" to
"cgroup_realize_queue" (as that is its purpose) to minimize confusion
about the two queues.
Just a rename, no functional changes.
Lennart Poettering [Tue, 26 Sep 2017 18:24:30 +0000 (20:24 +0200)]
unit: remove unused fields from Unit structure
Yu Watanabe [Wed, 27 Sep 2017 15:55:13 +0000 (00:55 +0900)]
network: change log level when sd_rtnl_message_get_family() returns invalid family (#6923)
From
bce67bbee359eec19e6778619b6651100a1c1477, systemd-networkd always shows
```
rtnl: received address with invalid family type 32, ignoring.
```
during boot-up. In the code, there are log_warning() and log_debug() for the
same situation, and the log_debug() is never called. So, let's lower the
log level and remove never called function.
Zbigniew Jędrzejewski-Szmek [Wed, 27 Sep 2017 15:54:06 +0000 (17:54 +0200)]
core/cgroup: add a helper macro for a common pattern (#6926)
Lennart Poettering [Wed, 27 Sep 2017 15:48:28 +0000 (17:48 +0200)]
socket: if RemoveOnStop= is turned on for a socket, try to unlink() pre-existing symlinks
Normally, Symlinks= failing is not considered fatal nor destructive.
Let's slightly alter behaviour here if RemoveOnStop= is turned on. In
that case the use in a way opted for destructive behaviour and we do
unlink all sockets and symlinks when the socket unit goes down. And that
means we might as well unlink any pre-existing if this mode is selected.
Yeah, it's a bit of a stretch to do this, but @OhNoMoreGit is right: if
RemoveOnStop= is on we are destructive regarding any pre-existing
symlinks on stop, and it would be quite weird if we wouldn't be on
start.
Lennart Poettering [Tue, 26 Sep 2017 16:36:41 +0000 (18:36 +0200)]
man: document that inability to execute Symlinks= is not fatal
Fixes: #6920
Lennart Poettering [Tue, 26 Sep 2017 16:27:56 +0000 (18:27 +0200)]
socket: create leading directories for socket symlinks
It really doesn't hurt creating prefix directories if necessary, as we
tend to do that for other file nodes we create, too.
Fixes: #6920
Lennart Poettering [Tue, 26 Sep 2017 16:27:09 +0000 (18:27 +0200)]
socket: make sure we warn loudly about symlinks we can't create
Note that this change does not make symlink creation failing fatal. I am
not entirely sure about whether it should be, but I am leaning towards
not making it fatal for two reasons: symlinks like this tend to be a
compatibility feature, and hence unlikely to be essential for operation,
in a way this breaks compatibility, and while doing that is not off the
table, we should probably avoid it if we are not entirely sure it's a
good thing.
Note that this also changes plain symlink() to symlink_idempotent() so
that existing symlinks with the right destination are nothing we log
about.
Fixes: #6920
Lennart Poettering [Tue, 26 Sep 2017 16:26:20 +0000 (18:26 +0200)]
fs-util: propagate EEXIST error in symlink_idempotent() as EEXIST
We really shouldn't silently translate the error code here for no
reason.
Zbigniew Jędrzejewski-Szmek [Wed, 27 Sep 2017 09:23:02 +0000 (11:23 +0200)]
Merge pull request #6919 from poettering/ebpf-followup
Some minor follow-ups for the ebpf/cgroup PR
Zbigniew Jędrzejewski-Szmek [Wed, 27 Sep 2017 09:16:24 +0000 (11:16 +0200)]
Merge pull request #6915 from poettering/log-execute
make execute.c logging a bit less special
Lennart Poettering [Wed, 27 Sep 2017 07:25:25 +0000 (09:25 +0200)]
udev: proc_cmdline_get_key() FTW! (#6925)
Let's use proc_cmdline_get_key() instead of some strstr() logic to find
a kernel command line key. Using strstr() gets confused by similarly
named keys, and we should reuse our own code as much as we can anyway...
Fixes: #6330
Lennart Poettering [Tue, 26 Sep 2017 14:46:17 +0000 (16:46 +0200)]
catalog: split out the one German language entry we have in systemd.catalog into its own file
All other languages have their own file, let's make sure German does
too.
Lennart Poettering [Tue, 26 Sep 2017 14:42:02 +0000 (16:42 +0200)]
catalog: add two recent message ID additions to catalog
Just brief texts for now, so that we have something
(And in the long rung we should beef all this up, and add a test that
every ID listed in sd-messages.h is accompanied by a matching catalog
entry)
Lennart Poettering [Tue, 26 Sep 2017 14:33:03 +0000 (16:33 +0200)]
run: also show IP traffic accounting data on "systemd-run --wait"
If we collect we should show it.
Lennart Poettering [Tue, 26 Sep 2017 14:18:50 +0000 (16:18 +0200)]
core: improve dbus-cgroup error message
As suggested by @keszybz in the review of #6764
Zbigniew Jędrzejewski-Szmek [Tue, 26 Sep 2017 20:38:02 +0000 (22:38 +0200)]
Merge pull request #6912 from poettering/mount-kill-control
mount unit state engine fixes
Alan Jenkins [Tue, 26 Sep 2017 17:47:50 +0000 (18:47 +0100)]
Revert "units: don't kill the emergency shell when sysinit.target is triggered (#6765)" (#6904)
This reverts commit
f1e24a259ca182b6cd8a723a56da43435ce48aac. Oops.
# systemctl emergency
Failed to start emergency.target: Transaction order is cyclic. See syste...
See system logs and 'systemctl status emergency.target' for details.
# systemctl status emergency.target
● emergency.target - Emergency Mode
Loaded: loaded (/usr/lib/systemd/system/emergency.target; static; vendor preset: disabled)
Active: inactive (dead) since Mon 2017-09-25 10:43:02 BST; 2h 42min ago
Docs: man:systemd.special(7)
systemd[1]: sysinit.target: Found dependency on sysinit.target/stop
sysinit.target: Unable to break cycle starting with sysinit.target/stop
network.target: Found ordering cycle on wpa_supplicant.service/stop
network.target: Found dependency on sysinit.target/stop
network.target: Found dependency on emergency.target/start
network.target: Found dependency on emergency.service/start
network.target: Found dependency on serial-getty@ttyS0.service/stop
network.target: Found dependency on systemd-user-sessions.service/stop
network.target: Found dependency on network.target/stop
network.target: Unable to break cycle starting with network.target/stop
IMO #6509 is ugly enough that we should aim to answer it. But it could
take some time to investigate, so let's re-open the issue as a first step.
Lennart Poettering [Tue, 26 Sep 2017 16:09:23 +0000 (18:09 +0200)]
Merge pull request #6902 from keszybz/two-property-printing-fixes
Two property printing fixes
Lennart Poettering [Tue, 26 Sep 2017 16:00:38 +0000 (18:00 +0200)]
update TODO
Lennart Poettering [Tue, 26 Sep 2017 15:52:25 +0000 (17:52 +0200)]
execute: let's close glibc syslog channels too
Just in case something opened them, let's make sure glibc invalidates
them too.
Thankfully so far no library opened log channels behind our back, at
least as far as I know, hence this is actually a NOP, but let's better
be safe than sorry.
Lennart Poettering [Tue, 26 Sep 2017 15:47:27 +0000 (17:47 +0200)]
execute: normalize logging in execute.c
Now that logging can implicitly reopen the log streams when needed we
can log errors without any special magic, hence let's normalize things,
and log the same way we do everywhere else.
Lennart Poettering [Tue, 26 Sep 2017 15:41:53 +0000 (17:41 +0200)]
execute: drop explicit log_open()/log_close() now that it is unnecessary
Lennart Poettering [Tue, 26 Sep 2017 15:45:32 +0000 (17:45 +0200)]
execute: make use of the new logging mode in execute.c
Lennart Poettering [Tue, 26 Sep 2017 15:45:09 +0000 (17:45 +0200)]
log: add a mode where we open the log fds for every single log message
This we can then make use in execute.c to make error logging a bit less
special when preparing for process execution, as we can still log but
don't have any fds open continously.
Lennart Poettering [Mon, 25 Sep 2017 18:26:47 +0000 (20:26 +0200)]
log: let's make use of the fact that our functions return the negative error code for log_oom() too
Lennart Poettering [Tue, 26 Sep 2017 15:42:17 +0000 (17:42 +0200)]
execute: downgrade a log message ERR → WARNING, since we proceed ignoring its result
Lennart Poettering [Tue, 26 Sep 2017 15:42:57 +0000 (17:42 +0200)]
execute: rework logging in setup_keyring() to include unit info
Let's use log_unit_error() instead of log_error() everywhere (and
friends).
Lennart Poettering [Mon, 25 Sep 2017 17:57:52 +0000 (19:57 +0200)]
swap: introduce SWAP_STATE_WITH_PROCESS() similar to MOUNT_STATE_WITH_PROCESS()
Lennart Poettering [Mon, 25 Sep 2017 17:53:19 +0000 (19:53 +0200)]
swap: adjust swap.c in a similar way to what we just did to mount.c
Also drop the redundant states and make all similar changes too.
Thankfully the swap.c state engine is much simpler than mount.c's, hence
this should be easier to digest.
Lennart Poettering [Mon, 25 Sep 2017 17:25:50 +0000 (19:25 +0200)]
mount: rename mount_state_active() → MOUNT_STATE_WITH_PROCESS()
The function returns true for all states that have a control process
running, and each time we call it that's what we want to know, hence
let's rename it accordingly. Moreover, the more generic unit states have
an ACTIVE state, and it is defined quite differently from the set of
states this function returns true for, hence let's avoid confusion and
not reuse the word "ACTIVE" here in a different context.
Finally, let's uppercase this, since in most ways it's pretty much
identical to a macro
Lennart Poettering [Mon, 25 Sep 2017 17:13:37 +0000 (19:13 +0200)]
mount: rework mount state engine
This changes the mount unit state engine in the following ways:
1. The MOUNT_MOUNTING_SIGTERM and MOUNT_MOUNTING_SIGKILL are removed.
They have been pretty much equivalent to MOUNT_UNMOUNTING_SIGTERM and
MOUNT_UNMOUNTING_SIGKILL in what they do, and the outcome has been
the same as well: the unit is stopped. Hence, let's simplify things a
bit, and merge them. Note that we keep
MOUNT_REMOUNTING_{SIGTERM|SIGKILL} however, as those states have a
different outcome: the unit remains started.
2. mount_enter_signal() will now honour the SendSIGKILL= option of the
mount unit if it was set. This was previously done already when we
entered the signal states through a timeout, and was simply missing
here.
3. A new helper function mount_enter_dead_or_mounted() is added that
places the mount unit in either MOUNT_DEAD or MOUNT_MOUNTED,
depending on what the kernel thinks about the mount's state. This
function is called at various places now, wherever we finished an
operation, and want to make sure our own state reflects again what
the kernel thinks. Previously we had very similar code in a number of
places and in other places didn't recheck the kernel state. Let's do
that with the same logic and function at all relevant places now.
4. Rework mount_stop(): never forget about running control processes.
Instead: when we have a start (i.e. a /bin/mount) process running,
and are asked to stop, then enter the kill states for it, so that it
gets cleaned up. This fixes #6048. Moreover, when we have a reload
process running convert the possible states into the relevant
unmounting states, so that we can properly execute the requested
operation.
Fixes #6048
Lennart Poettering [Mon, 25 Sep 2017 16:56:19 +0000 (18:56 +0200)]
mount: clean up reload_result management a bit
Let's only collect the first failure in the load result, and let's clear
it explicitly when we are about to enter a new reload operation. This
makes it more alike the handling of the main result value (which also
only stores the first failure), and also the handling of service.c's
reload state.
Lennart Poettering [Mon, 25 Sep 2017 15:17:30 +0000 (17:17 +0200)]
service: rework service_kill_control_processes()
Let's make sure we explicitly also kill any control process we know of,
given that it might have moved outside of our control group.
Lennart Poettering [Mon, 25 Sep 2017 15:15:59 +0000 (17:15 +0200)]
set: add new helper set_make() which is like set_new() + multiple set_put() in vararg
Jan Synacek [Tue, 26 Sep 2017 14:07:34 +0000 (16:07 +0200)]
test-cpu-set-util.c: fix typo in comment (#6916)
Zbigniew Jędrzejewski-Szmek [Tue, 26 Sep 2017 14:04:33 +0000 (16:04 +0200)]
basic/log: fix return value from log_struct_iovec_internal()
This returned value so far wasn't used anywhere, so there's no change
in behaviour.
Lennart Poettering [Tue, 26 Sep 2017 14:00:28 +0000 (16:00 +0200)]
Merge pull request #6917 from keszybz/restore-some-tests
Restore some tests
Jan Synacek [Tue, 26 Sep 2017 11:50:31 +0000 (13:50 +0200)]
test-cpu-set-util.c: fix typo in comment (#6916)