platform/upstream/systemd.git
7 years agomeson: move library version defines to the top (#6939)
Zbigniew Jędrzejewski-Szmek [Thu, 28 Sep 2017 17:24:16 +0000 (19:24 +0200)]
meson: move library version defines to the top (#6939)

7 years agoMerge pull request #6936 from poettering/news-235
Lennart Poettering [Thu, 28 Sep 2017 17:22:55 +0000 (19:22 +0200)]
Merge pull request #6936 from poettering/news-235

News 235

7 years agoMerge pull request #6933 from yuwata/use_in_set
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

7 years agomeson: bump release to 235
Lennart Poettering [Thu, 28 Sep 2017 09:29:52 +0000 (11:29 +0200)]
meson: bump release to 235

7 years agoadd some more things to TODO
Lennart Poettering [Thu, 28 Sep 2017 09:26:11 +0000 (11:26 +0200)]
add some more things to TODO

7 years agoprepare NEWS for 235
Lennart Poettering [Thu, 28 Sep 2017 09:26:02 +0000 (11:26 +0200)]
prepare NEWS for 235

7 years agolibsystemd: use IN_SET macro
Yu Watanabe [Thu, 28 Sep 2017 08:17:04 +0000 (17:17 +0900)]
libsystemd: use IN_SET macro

7 years agoMerge pull request #6924 from andir/vrf-dhcpv4
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

7 years agoudev-rules: all values can contain escaped double quotes now (#6890)
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

7 years agoMerge pull request #6928 from poettering/cgroup-empty-race
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)

7 years agonetworkd: use assert_not_reached()
Yu Watanabe [Thu, 28 Sep 2017 06:38:50 +0000 (15:38 +0900)]
networkd: use assert_not_reached()

7 years agonetworkd: use IN_SET macro
Yu Watanabe [Thu, 28 Sep 2017 06:37:38 +0000 (15:37 +0900)]
networkd: use IN_SET macro

7 years agoman/systemd.network: Updated documentation about VRF traffic redirection
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.

7 years agoman/systemd.network: Added documentation about the DHCP.RouteTable behaviour with...
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

7 years agonetworkd: use VRFs routing table for DHCP routes
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.

7 years agoMerge pull request #6922 from poettering/symlink-sockets
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

7 years agocore: log unit failure with type-specific result code
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.

7 years agocore: free_and_strdup() FTW!
Lennart Poettering [Tue, 26 Sep 2017 20:49:23 +0000 (22:49 +0200)]
core: free_and_strdup() FTW!

7 years agocgroup: IN_SET() FTW!
Lennart Poettering [Tue, 26 Sep 2017 20:49:09 +0000 (22:49 +0200)]
cgroup: IN_SET() FTW!

7 years agocgroup: after determining that a cgroup is empty, asynchronously dispatch this
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

7 years agocore: rename cgroup_queue → cgroup_realize_queue
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.

7 years agounit: remove unused fields from Unit structure
Lennart Poettering [Tue, 26 Sep 2017 18:24:30 +0000 (20:24 +0200)]
unit: remove unused fields from Unit structure

7 years agonetwork: change log level when sd_rtnl_message_get_family() returns invalid family...
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.

7 years agocore/cgroup: add a helper macro for a common pattern (#6926)
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)

7 years agosocket: if RemoveOnStop= is turned on for a socket, try to unlink() pre-existing...
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.

7 years agoman: document that inability to execute Symlinks= is not fatal
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

7 years agosocket: create leading directories for socket symlinks
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

7 years agosocket: make sure we warn loudly about symlinks we can't create
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

7 years agofs-util: propagate EEXIST error in symlink_idempotent() as EEXIST
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.

7 years agoMerge pull request #6919 from poettering/ebpf-followup
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

7 years agoMerge pull request #6915 from poettering/log-execute
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

7 years agoudev: proc_cmdline_get_key() FTW! (#6925)
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

7 years agocatalog: split out the one German language entry we have in systemd.catalog into...
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.

7 years agocatalog: add two recent message ID additions to catalog
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)

7 years agorun: also show IP traffic accounting data on "systemd-run --wait"
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.

7 years agocore: improve dbus-cgroup error message
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

7 years agoMerge pull request #6912 from poettering/mount-kill-control
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

7 years agoRevert "units: don't kill the emergency shell when sysinit.target is triggered (...
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.

7 years agoMerge pull request #6902 from keszybz/two-property-printing-fixes
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

7 years agoupdate TODO
Lennart Poettering [Tue, 26 Sep 2017 16:00:38 +0000 (18:00 +0200)]
update TODO

7 years agoexecute: let's close glibc syslog channels too
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.

7 years agoexecute: normalize logging in execute.c
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.

7 years agoexecute: drop explicit log_open()/log_close() now that it is unnecessary
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

7 years agoexecute: make use of the new logging mode in execute.c
Lennart Poettering [Tue, 26 Sep 2017 15:45:32 +0000 (17:45 +0200)]
execute: make use of the new logging mode in execute.c

7 years agolog: add a mode where we open the log fds for every single log message
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.

7 years agolog: let's make use of the fact that our functions return the negative error code...
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

7 years agoexecute: downgrade a log message ERR → WARNING, since we proceed ignoring its result
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

7 years agoexecute: rework logging in setup_keyring() to include unit info
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).

7 years agoswap: introduce SWAP_STATE_WITH_PROCESS() similar to MOUNT_STATE_WITH_PROCESS()
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()

7 years agoswap: adjust swap.c in a similar way to what we just did to mount.c
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.

7 years agomount: rename mount_state_active() → MOUNT_STATE_WITH_PROCESS()
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

7 years agomount: rework mount state engine
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

7 years agomount: clean up reload_result management a bit
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.

7 years agoservice: rework service_kill_control_processes()
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.

7 years agoset: add new helper set_make() which is like set_new() + multiple set_put() in vararg
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

7 years agotest-cpu-set-util.c: fix typo in comment (#6916)
Jan Synacek [Tue, 26 Sep 2017 14:07:34 +0000 (16:07 +0200)]
test-cpu-set-util.c: fix typo in comment (#6916)

7 years agobasic/log: fix return value from log_struct_iovec_internal()
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.

7 years agoMerge pull request #6917 from keszybz/restore-some-tests
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

7 years agotest-cpu-set-util.c: fix typo in comment (#6916)
Jan Synacek [Tue, 26 Sep 2017 11:50:31 +0000 (13:50 +0200)]
test-cpu-set-util.c: fix typo in comment (#6916)

7 years agomeson: hook up hwdb-test.sh again
Zbigniew Jędrzejewski-Szmek [Tue, 26 Sep 2017 11:44:04 +0000 (13:44 +0200)]
meson: hook up hwdb-test.sh again

The motivation for the ./systemd-hwdb is the same as in the grandparent
for systemd-sysv-generator.

7 years agomeson: hook up udev-test.pl again
Zbigniew Jędrzejewski-Szmek [Tue, 26 Sep 2017 11:39:43 +0000 (13:39 +0200)]
meson: hook up udev-test.pl again

Seems it was dropped along with the automake rules in
72cdb3e783174dcf9223a49f03e3b0e2ca95ddb8.

7 years agosysv-generator-test: do not query $builddir
Zbigniew Jędrzejewski-Szmek [Tue, 26 Sep 2017 11:34:55 +0000 (13:34 +0200)]
sysv-generator-test: do not query $builddir

This variable is not set by meson, so let's not try to use it.

We could use some more elaborate scheme (e.g. based on $MESON_BUILD_ROOT and
$MESON_SUBDIR) to find the path to systemd-sysv-generator, but it seems
that plain ./systemd-sysv-generator works just as well and has the advantage
that it's easy to invoke the test by hand (as long as one cd's to the
meson build dir).

7 years agosysv-generator-test: drop python2 work-around
Zbigniew Jędrzejewski-Szmek [Tue, 26 Sep 2017 09:59:08 +0000 (11:59 +0200)]
sysv-generator-test: drop python2 work-around

We require python3 for meson anyway, so support python2 doesn't seem
useful anymore.

7 years agojournal-verfiy: add a couple of missing le64toh() calls (#6888)
Lennart Poettering [Mon, 25 Sep 2017 20:26:10 +0000 (22:26 +0200)]
journal-verfiy: add a couple of missing le64toh() calls (#6888)

Apparently BE users don't verify their journals...

Noticed as result of #6887

7 years agostring-util: use size_t for strjoina macro (#6914)
Jonathan Lebon [Mon, 25 Sep 2017 19:56:57 +0000 (15:56 -0400)]
string-util: use size_t for strjoina macro (#6914)

`strlen` returns a `size_t` and `alloca` expects a `size_t`.

7 years agoinstall: drop left-over debug message (#6913)
Zbigniew Jędrzejewski-Szmek [Mon, 25 Sep 2017 17:59:49 +0000 (19:59 +0200)]
install: drop left-over debug message (#6913)

7 years agoshared/bus-util: format uid==-1 and gid==-1 as [not set]
Zbigniew Jędrzejewski-Szmek [Mon, 25 Sep 2017 09:23:59 +0000 (11:23 +0200)]
shared/bus-util: format uid==-1 and gid==-1 as [not set]

$ systemctl show systemd-journald -p UID,GID
UID=4294967295
GID=4294967295



$ systemctl show systemd-journald -p UID,GID
UID=[not set]
GID=[not set]

Just seeing the number is very misleading.

Fixes #6511.

7 years agobasic/cap-list: report empty capability set as ""
Zbigniew Jędrzejewski-Szmek [Mon, 25 Sep 2017 09:09:57 +0000 (11:09 +0200)]
basic/cap-list: report empty capability set as ""

$ systemctl show systemd-journald -p CapabilityBoundingSet,AmbientCapabilities
CapabilityBoundingSet=cap_chown cap_dac_override cap_dac_read_search cap_fowner cap_setgid ...
AmbientCapabilities=(null)



$ systemctl show systemd-journald -p CapabilityBoundingSet,AmbientCapabilities
CapabilityBoundingSet=cap_chown cap_dac_override cap_dac_read_search cap_fowner cap_setgid ...
AmbientCapabilities=

Partially fixes #6511. Add some basic tests for the printing function.

7 years agoMerge pull request #6893 from poettering/cgroup-delegate-yay
Zbigniew Jędrzejewski-Szmek [Sun, 24 Sep 2017 18:53:04 +0000 (20:53 +0200)]
Merge pull request #6893 from poettering/cgroup-delegate-yay

cgroup delegation fixes, as well as socket unit slice assignment

7 years agoMerge pull request #6891 from poettering/read-line
Zbigniew Jędrzejewski-Szmek [Sun, 24 Sep 2017 18:51:01 +0000 (20:51 +0200)]
Merge pull request #6891 from poettering/read-line

add read_line() helper as bounded getline() and make use of it at some places

7 years agoMerge pull request #6887 from rantala/6447
Lennart Poettering [Sun, 24 Sep 2017 17:52:07 +0000 (19:52 +0200)]
Merge pull request #6887 from rantala/6447

journal: add object sanity check to journal_file_move_to_object() (#6447)

7 years agofileio: return 0 from read_one_line_file on success
Zbigniew Jędrzejewski-Szmek [Sun, 24 Sep 2017 12:27:21 +0000 (14:27 +0200)]
fileio: return 0 from read_one_line_file on success

Fixup for f4b51a2d09. Suggested by Evgeny Vereshchagin.

7 years agojournal: add missing le64toh() calls in journal_file_check_object()
Tommi Rantala [Sun, 24 Sep 2017 08:56:52 +0000 (11:56 +0300)]
journal: add missing le64toh() calls in journal_file_check_object()

Lennart Poettering noticed missing le64toh() calls.

7 years agotest-fileio: also test read_line() with actual files
Zbigniew Jędrzejewski-Szmek [Sun, 24 Sep 2017 07:10:48 +0000 (09:10 +0200)]
test-fileio: also test read_line() with actual files

Just in case the real FILE and the one from fmemopen weren't exactly
the same.

7 years agotest-fileio: close two leaked file handles
Zbigniew Jędrzejewski-Szmek [Sun, 24 Sep 2017 06:59:49 +0000 (08:59 +0200)]
test-fileio: close two leaked file handles

7 years agoman: add missing verb in timedatectl(1) (#6896)
Zbigniew Jędrzejewski-Szmek [Sat, 23 Sep 2017 14:51:41 +0000 (16:51 +0200)]
man: add missing verb in timedatectl(1) (#6896)

As noted by Michael Biebl.

7 years agoMerge pull request #6894 from poettering/read-full-file-optimize
Zbigniew Jędrzejewski-Szmek [Sat, 23 Sep 2017 11:31:02 +0000 (13:31 +0200)]
Merge pull request #6894 from poettering/read-full-file-optimize

fileio: various fixes

7 years agoMerge pull request #6892 from keszybz/enablement-work
Lennart Poettering [Sat, 23 Sep 2017 10:44:49 +0000 (12:44 +0200)]
Merge pull request #6892 from keszybz/enablement-work

Fix various issues with enabled/disabled units

7 years agotest-conf-parser: add tests for the new long lines, including overflow handling
Zbigniew Jędrzejewski-Szmek [Thu, 21 Sep 2017 12:36:12 +0000 (14:36 +0200)]
test-conf-parser: add tests for the new long lines, including overflow handling

7 years agotest-conf-parser: use _cleanup_
Zbigniew Jędrzejewski-Szmek [Thu, 21 Sep 2017 10:02:49 +0000 (12:02 +0200)]
test-conf-parser: use _cleanup_

7 years agofileio: use _cleanup_ for FILE unlocking
Zbigniew Jędrzejewski-Szmek [Sat, 23 Sep 2017 08:48:09 +0000 (10:48 +0200)]
fileio: use _cleanup_ for FILE unlocking

7 years agoupdate TODO
Lennart Poettering [Fri, 22 Sep 2017 16:27:03 +0000 (18:27 +0200)]
update TODO

7 years agoconf-parse: remove 4K line length limit
Lennart Poettering [Fri, 22 Sep 2017 16:26:35 +0000 (18:26 +0200)]
conf-parse: remove 4K line length limit

Let's use read_line() to solve our long line limitation.

Fixes #3302.

7 years agotest-conf-parser: add some basic tests for config_parse()
Zbigniew Jędrzejewski-Szmek [Thu, 21 Sep 2017 12:24:01 +0000 (14:24 +0200)]
test-conf-parser: add some basic tests for config_parse()

This function is pretty important, but we weren't calling it directly
even once in tests.

v2: add a few tests for escaping and line continuations

7 years agofileio: initialize errno to zero before we do fread()
Lennart Poettering [Fri, 22 Sep 2017 19:05:03 +0000 (21:05 +0200)]
fileio: initialize errno to zero before we do fread()

if there was something in the read buffer already errno might not be set
on error, let's detect that case.

7 years agofileio: try to read one byte too much in read_full_stream()
Lennart Poettering [Fri, 22 Sep 2017 19:03:33 +0000 (21:03 +0200)]
fileio: try to read one byte too much in read_full_stream()

Let's read one byte more than the file size we read from stat() on the
first fread() invocation. That way, the first read() will already be
short and indicate eof to fread().

This is a minor optimization, and replaces #3908.

7 years agofileio: move fsync() logic into write_string_stream_ts()
Lennart Poettering [Fri, 22 Sep 2017 18:59:39 +0000 (20:59 +0200)]
fileio: move fsync() logic into  write_string_stream_ts()

That way, write_string_stream_ts() becomes more powerful, and we can
remove duplicate code from  write_string_file_atomic() and
write_string_file_ts().

7 years agofileio: make write_string_stream() accept flags parameter
Lennart Poettering [Fri, 22 Sep 2017 18:55:34 +0000 (20:55 +0200)]
fileio: make write_string_stream() accept flags parameter

Let's make write_string_stream() and write_string_file() more alike, and
pass the same flag set so that we can remove a number of boolean
parameters.

7 years agofileio: support writing atomic files with timestamp
Lennart Poettering [Fri, 22 Sep 2017 18:45:06 +0000 (20:45 +0200)]
fileio: support writing atomic files with timestamp

Let's make sure "ts" is taken into account when writing atomic files,
too.

7 years agocgroup-util: replace one use of fgets() by read_line()
Lennart Poettering [Fri, 22 Sep 2017 16:25:45 +0000 (18:25 +0200)]
cgroup-util: replace one use of fgets() by read_line()

7 years agofileio: rework read_one_line_file() on top of read_line()
Lennart Poettering [Fri, 22 Sep 2017 16:01:32 +0000 (18:01 +0200)]
fileio: rework read_one_line_file() on top of read_line()

7 years agodef: add new constant LONG_LINE_MAX
Lennart Poettering [Fri, 22 Sep 2017 18:23:58 +0000 (20:23 +0200)]
def: add new constant LONG_LINE_MAX

LONG_LINE_MAX is much like LINE_MAX, but longer.

As it turns out LINE_MAX at 4096 is too short for many usecases. Since
the general concept of having a common maximum line length limit makes
sense let's add our own, and make it larger (1MB for now).

7 years agofileio: add new helper call read_line() as bounded getline() replacement
Lennart Poettering [Fri, 22 Sep 2017 15:55:53 +0000 (17:55 +0200)]
fileio: add new helper call read_line() as bounded getline() replacement

read_line() is much like getline(), and returns a line read from a
FILE*, of arbitrary sizes. In contrast to gets() it will grow the buffer
dynamically, and in contrast to getline() it will place a user-specified
boundary on the line.

7 years agosocket: assign socket units to a default slice unconditionally
Lennart Poettering [Fri, 22 Sep 2017 18:09:21 +0000 (20:09 +0200)]
socket: assign socket units to a default slice unconditionally

Due to the chown() logic socket units might end up with processes even
if no explicit command is defined for them, hence let's make sure these
processes are in the right cgroup, and that means within a slice.

Mount, swap and service units unconditionally are assigned to a slice
already, let's do the same here, too.

(This becomes more important as soon as the ebpf/firewall stuff is
merged, as there'll be another reason to fork off processes then)

7 years agocgroup: make use of unit_cgroup_delegate() where useful
Lennart Poettering [Fri, 22 Sep 2017 18:02:23 +0000 (20:02 +0200)]
cgroup: make use of unit_cgroup_delegate() where useful

It's an easy-to-use wrapper, so let's take benefit of it.

7 years agocgroup: rework which files we chown() on delegation
Lennart Poettering [Fri, 22 Sep 2017 17:58:24 +0000 (19:58 +0200)]
cgroup: rework which files we chown() on delegation

On cgroupsv2 we should also chown()/chmod() the subtree_control file,
so that children can use controllers the way they like.

On cgroupsv1 we should also chown()/chmod() cgroups.clone_children, as
not setting this for new cgroups makes little sense, and hence delegated
clients should be able to write to it.

Note that error handling for both cases is different. subtree_control
matters so we check for errors, but the clone_children/tasks stuff
doesn't really, as it's legacy stuff. Hence we only log errors and
proceed.

Fixes: #6216

7 years agocgroup-util: downgrade log messages from library code to LOG_DEBUG
Lennart Poettering [Fri, 22 Sep 2017 17:57:07 +0000 (19:57 +0200)]
cgroup-util: downgrade log messages from library code to LOG_DEBUG

These errors don't really matter, that's why we log and proceed in the
current code. However, we currently log at LOG_WARNING, but we really
shouldn't given that this is library code. Hence downgrade this to
LOG_DEBUG.

7 years agoman: Requires= needs After= to deactivate "this unit" (#6869)
John Lin [Fri, 22 Sep 2017 17:15:28 +0000 (01:15 +0800)]
man: Requires= needs After= to deactivate "this unit" (#6869)

Fixes: #6856

7 years agoMerge pull request #6879 from marcelhollerbach/testsuite-fix
Lennart Poettering [Fri, 22 Sep 2017 16:47:59 +0000 (18:47 +0200)]
Merge pull request #6879 from marcelhollerbach/testsuite-fix

time-util: testsuite fix

7 years agoinstall: consider globally enabled units as "enabled" for the user
Zbigniew Jędrzejewski-Szmek [Fri, 22 Sep 2017 12:46:09 +0000 (14:46 +0200)]
install: consider globally enabled units as "enabled" for the user

We would not consider symlinks in /etc/systemd/user/*.{wants,requires}/
towards the user unit being "enabled", because the symlinks were not
located in "config" paths. But this is confusing to users, since those units
are clearly enabled and will be started. So let's muddle the definition of
enablement a bit to include the paths only accessible to root when looking for
enabled user units.

Fixes #4432.