]> git.ipfire.org Git - thirdparty/systemd.git/log
thirdparty/systemd.git
6 years agomkosi: add pcre2 to our build deps, as we can now link to it 8184/head
Lennart Poettering [Wed, 14 Feb 2018 18:56:24 +0000 (19:56 +0100)] 
mkosi: add pcre2 to our build deps, as we can now link to it

6 years agoask-password-api: many fixes to ask_password_tty()
Lennart Poettering [Wed, 14 Feb 2018 17:41:37 +0000 (18:41 +0100)] 
ask-password-api: many fixes to ask_password_tty()

A couple of fixes:

1. always bzero_explicit() away what we remove from the passphrase
   buffer. The UTF-8 code assumes the string remains NUL-terminated, and
   we hence should enforce that. memzero() would do too here, but let's
   be paranoid after all this is key material.

2. when clearing '*' characters from string, do so counting UTF-8
   codepoints properly. We already have code in place to count UTF-8
   codepoints when generating '*' characters, hence we should take the
   same care when clearing them again.

3. Treat NUL on input as an alternative terminator to newline or EOF.

4. When removing characters from the password always also reset the
   "codepoint" index properly.

6 years agoutf8: add utf8_n_codepoints() for counting complete utf8 codepoints in a string
Lennart Poettering [Wed, 14 Feb 2018 17:41:03 +0000 (18:41 +0100)] 
utf8: add utf8_n_codepoints() for counting complete utf8 codepoints in a string

6 years agoterminal-util: make resolve_dev_console() less weird
Lennart Poettering [Wed, 14 Feb 2018 16:30:37 +0000 (17:30 +0100)] 
terminal-util: make resolve_dev_console() less weird

Let's normalize the behaviour: return a negative errno style error code,
and return the resolved string directly as argument.

6 years agoterminal-util: modernize get_kernel_consoles() a bit
Lennart Poettering [Wed, 14 Feb 2018 13:56:17 +0000 (14:56 +0100)] 
terminal-util: modernize get_kernel_consoles() a bit

Also, make sure when we run in a container, we don't use the data from
/sys at all, but immediately fall back to /dev/console itself.

6 years agotty-ask-password-agent: reenable color for boot-time password prompt
Lennart Poettering [Wed, 14 Feb 2018 13:30:30 +0000 (14:30 +0100)] 
tty-ask-password-agent: reenable color for boot-time password prompt

The password prompt used to be highlighted, and that was a good thing.
Let's fix things to make the prompt highlighted again.

Fixes: #3853
6 years agoterminal-util: add some explanatory comments
Lennart Poettering [Wed, 14 Feb 2018 13:28:17 +0000 (14:28 +0100)] 
terminal-util: add some explanatory comments

6 years agoupdate TODO
Lennart Poettering [Wed, 14 Feb 2018 13:28:00 +0000 (14:28 +0100)] 
update TODO

6 years agoprocess: shortcut getenv_for_pid() for our own process
Lennart Poettering [Wed, 14 Feb 2018 13:27:31 +0000 (14:27 +0100)] 
process: shortcut getenv_for_pid() for our own process

6 years agoask-password: pretty flags enum definition a bit
Lennart Poettering [Tue, 13 Feb 2018 23:13:26 +0000 (00:13 +0100)] 
ask-password: pretty flags enum definition a bit

6 years agotty-ask-password-agent: don't open terminal multiple times
Lennart Poettering [Tue, 13 Feb 2018 23:10:00 +0000 (00:10 +0100)] 
tty-ask-password-agent: don't open terminal multiple times

We already have the terminal open, hence pass the fd we got to
ask_password_tty(), so that it doesn't have to reopen it a second time.

This is mostly an optimization, but it has the nice benefit of making us
independent from RLIMIT_NOFILE issues and so on, as we don't need to
allocate another fd needlessly.

6 years agoask-password: derive pollfd array from enum
Lennart Poettering [Tue, 13 Feb 2018 23:02:23 +0000 (00:02 +0100)] 
ask-password: derive pollfd array from enum

It's prettier that way!

6 years agoask-password: round up when determining sleep time
Lennart Poettering [Tue, 13 Feb 2018 22:57:57 +0000 (23:57 +0100)] 
ask-password: round up when determining sleep time

We should rather sleep to much than too little. This otherwise might
result in a busy loop, because we slept too little and then recheck
again coming to the conclusion we need to go to sleep again, and so on.

6 years agoask-password: let's use structure initialization properly
Lennart Poettering [Tue, 13 Feb 2018 22:57:40 +0000 (23:57 +0100)] 
ask-password: let's use structure initialization properly

6 years agoask-password: let's (void) cast where appropriate
Lennart Poettering [Tue, 13 Feb 2018 22:57:13 +0000 (23:57 +0100)] 
ask-password: let's (void) cast where appropriate

6 years agoask-password: bypass clean-up if we don't need it
Lennart Poettering [Tue, 13 Feb 2018 22:56:57 +0000 (23:56 +0100)] 
ask-password: bypass clean-up if we don't need it

6 years agoask-password: don't use ttyfd if it is not set
Lennart Poettering [Tue, 13 Feb 2018 22:55:58 +0000 (23:55 +0100)] 
ask-password: don't use ttyfd if it is not set

6 years agotty-ask-password-agent: show right TTY path in error message
Lennart Poettering [Tue, 13 Feb 2018 22:55:19 +0000 (23:55 +0100)] 
tty-ask-password-agent: show right TTY path in error message

6 years agotty-ask-password-agent: assing sendto() result to a ssize_t variable, not an int
Lennart Poettering [Tue, 13 Feb 2018 22:53:59 +0000 (23:53 +0100)] 
tty-ask-password-agent: assing sendto() result to a ssize_t variable, not an int

We should be careful with these types, and if we do convert between
"int" and "ssize_t" we should do so explicitly rather than implicitly.
Otherwise this just looks like a bug.

6 years agoterminal-util: minor, trivial fixes and improvements
Lennart Poettering [Tue, 13 Feb 2018 22:53:34 +0000 (23:53 +0100)] 
terminal-util: minor, trivial fixes and improvements

6 years agoterminal-util: when making /dev/null or the console stdio, forget cached terminal...
Lennart Poettering [Tue, 13 Feb 2018 22:50:26 +0000 (23:50 +0100)] 
terminal-util: when making /dev/null or the console stdio, forget cached terminal features

Let's forget all relevant terminal features we learnt when we make a
console or /dev/null stdin/stdout/stderr.

Also, while we are at it, let's drop the various _unlikely_ and
_likely_ annotiations around the terminal feature caches. In many cases
we call the relevant functions only once in which cases the annotations
are likely to do just harm and no good. After all we can't know if the
specific code will call us just once or many times...

6 years agoterminal-util: rework acquire_terminal()
Lennart Poettering [Tue, 13 Feb 2018 20:24:37 +0000 (21:24 +0100)] 
terminal-util: rework acquire_terminal()

This modernizes acquire_terminal() in a couple of ways:

1. The three boolean arguments are replaced by a flags parameter, that
   should be more descriptive in what it does.

2. We now properly handle inotify queue overruns

3. We use _cleanup_ for closing the fds now, to shorten the code quite a
   bit.

Behaviour should not be altered by this.

6 years agotty-ask-password-agent: make code a tiny bit shorter
Lennart Poettering [Tue, 13 Feb 2018 18:17:17 +0000 (19:17 +0100)] 
tty-ask-password-agent: make code a tiny bit shorter

6 years agol10n: update POTFILES.in (#8163)
AsciiWolf [Tue, 13 Feb 2018 03:05:22 +0000 (04:05 +0100)] 
l10n: update POTFILES.in (#8163)

6 years agotmpfiles: age root-owned read-only files, by default (#7917)
itsbill [Mon, 12 Feb 2018 14:47:08 +0000 (09:47 -0500)] 
tmpfiles: age root-owned read-only files, by default (#7917)

[zj: The note in NEWS was added in 82c8e3e6503a40684cf265842bb1c26a8f7681b5
and released as part of systemd-237.]

6 years agoMerge pull request #8143 from yuwata/drop-unused-func
Yu Watanabe [Sat, 10 Feb 2018 03:47:12 +0000 (12:47 +0900)] 
Merge pull request #8143 from yuwata/drop-unused-func

Drop several unused functions

6 years agosocket-util: drop getnameinfo_pretty() 8143/head
Yu Watanabe [Fri, 9 Feb 2018 08:52:05 +0000 (17:52 +0900)] 
socket-util: drop getnameinfo_pretty()

6 years agoRevert "Periodically call sd_journal_process in journalctl" (#8147)
Zbigniew Jędrzejewski-Szmek [Fri, 9 Feb 2018 19:10:00 +0000 (20:10 +0100)] 
Revert "Periodically call sd_journal_process in journalctl" (#8147)

This reverts commit 992149c07e3ecfbfe4067641e92a6923e7aacda4.

https://github.com/systemd/systemd/pull/8144#issuecomment-364464627
$ (set -o pipefail; sudo ./build/journalctl --no-pager | wc -l; echo $?)
Failed to process inotify events: Bad file descriptor
1025
1

6 years agobasic/socket-util: drop use of NI_IDN_USE_STD3_ASCII_RULES
Zbigniew Jędrzejewski-Szmek [Fri, 9 Feb 2018 12:31:37 +0000 (13:31 +0100)] 
basic/socket-util: drop use of NI_IDN_USE_STD3_ASCII_RULES

The only use of socknameinfo_pretty() is in src/journal-remote/journal-remote.c,
to determine the output filename.

Replaces #8120.

6 years agofd-util: move certain fds above fd #2 (#8129)
Lennart Poettering [Fri, 9 Feb 2018 16:53:28 +0000 (17:53 +0100)] 
fd-util: move certain fds above fd #2 (#8129)

This adds some paranoia code that moves some of the fds we allocate for
longer periods of times to fds > 2 if they are allocated below this
boundary. This is a paranoid safety thing, in order to avoid that
external code might end up erroneously use our fds under the assumption
they were valid stdin/stdout/stderr. Think: some app closes
stdin/stdout/stderr and then invokes 'fprintf(stderr, …' which causes
writes on our fds.

This both adds the helper to do the moving as well as ports over a
number of users to this new logic. Since we don't want to litter all our
code with invocations of this I tried to strictly focus on fds we keep
open for long periods of times only and only in code that is frequently
loaded into foreign programs (under the assumptions that in our own
codebase we are smart enough to always keep stdin/stdout/stderr
allocated to avoid this pitfall). Specifically this means all code used
by NSS and our sd-xyz API:

1. our logging APIs
2. sd-event
3. sd-bus
4. sd-resolve
5. sd-netlink

This changed was inspired by this:

https://github.com/systemd/systemd/issues/8075#issuecomment-363689755

This shows that apparently IRL there are programs that do close
stdin/stdout/stderr, and we should accomodate for that.

Note that this won't fix any bugs, this just makes sure that buggy
programs are less likely to interfere with out own code.

6 years agoSuspend on lid close based on power status. (#8016)
Simon Fowler [Fri, 9 Feb 2018 16:37:39 +0000 (02:37 +1000)] 
Suspend on lid close based on power status. (#8016)

This change adds support for controlling the suspend-on-lid-close
behaviour based on the power status as well as whether the machine is
docked or has an external monitor. For backwards compatibility the new
configuration file variable is ignored completely by default, and must
be set explicitly before being considered in any decisions.

6 years agoMerge pull request #8066 from LittleCVR/udevadm-trigger-and-settle
Zbigniew Jędrzejewski-Szmek [Fri, 9 Feb 2018 16:09:42 +0000 (17:09 +0100)] 
Merge pull request #8066 from LittleCVR/udevadm-trigger-and-settle

udevadm: allow trigger command to be synchronous

6 years agoMerge pull request #8134 from keszybz/unit-load-paths
Zbigniew Jędrzejewski-Szmek [Fri, 9 Feb 2018 16:08:23 +0000 (17:08 +0100)] 
Merge pull request #8134 from keszybz/unit-load-paths

Various fixes to unit load paths, and systemd-analyze load-paths verb to list them

6 years agoservice: relax PID file symlink chain checks a bit (#8133)
Lennart Poettering [Fri, 9 Feb 2018 16:05:17 +0000 (17:05 +0100)] 
service: relax PID file symlink chain checks a bit (#8133)

Let's read the PID file after all if there's a potentially unsafe
symlink chain in place. But if we do, then refuse taking the PID if its
outside of the cgroup.

Fixes: #8085
6 years agoman:systemd.service(5): fix description of specifiers in command lines (#8146)
Oleander Reis [Fri, 9 Feb 2018 16:03:09 +0000 (17:03 +0100)] 
man:systemd.service(5): fix description of specifiers in command lines (#8146)

Command lines now accept specifiers within the first argument.

see issues #3061, #679 and pr #4835

6 years agoanalyze: slight simplification 8134/head
Zbigniew Jędrzejewski-Szmek [Thu, 8 Feb 2018 21:20:19 +0000 (22:20 +0100)] 
analyze: slight simplification

6 years agoanalyze: remove implicit conversions of numbers to booleans
Zbigniew Jędrzejewski-Szmek [Thu, 8 Feb 2018 21:20:01 +0000 (22:20 +0100)] 
analyze: remove implicit conversions of numbers to booleans

6 years agoman: make Notes section in systemd.geneator(5) toplevel
Zbigniew Jędrzejewski-Szmek [Thu, 8 Feb 2018 15:33:28 +0000 (16:33 +0100)] 
man: make Notes section in systemd.geneator(5) toplevel

This is mostly a indentation change and rewrapping.

6 years agoman: document unit load paths
Zbigniew Jędrzejewski-Szmek [Thu, 8 Feb 2018 15:23:43 +0000 (16:23 +0100)] 
man: document unit load paths

So far we didn't document control, transient, dbus config, or generator paths.
But those paths are visible to users, and they need to understand why systemd
loads units from those paths, and how the precedence hierarchy looks.
The whole thing is a bit messy, since the list of paths is quite long.
I made the tables a bit shorter by combining rows for the alternatives
where $XDG_* is set and the fallback.

In various places, tags are split like <element
  param="blah">
this. This is necessary to keep everyting in one logical XML line so that
docbook renders the table properly.

Replaces #8050.

6 years agoshared/path-lookup: rename user control dirs to "user.control"
Zbigniew Jędrzejewski-Szmek [Thu, 8 Feb 2018 13:36:17 +0000 (14:36 +0100)] 
shared/path-lookup: rename user control dirs to "user.control"

$ diff -u <(old/systemd-analyze --user unit-paths) <(new/systemd-analyze --user unit-paths)|colordiff
--- /proc/self/fd/14 2018-02-08 14:36:34.190046129 +0100
+++ /proc/self/fd/15 2018-02-08 14:36:34.190046129 +0100
@@ -1,5 +1,5 @@
-/home/zbyszek/.config/systemd/system.control
-/run/user/1000/systemd/system.control
+/home/zbyszek/.config/systemd/user.control
+/run/user/1000/systemd/user.control
 /run/user/1000/systemd/transient
 ...

Strictly speaking, online upgrades of user instances through daemon-reexec will
be broken. We can get away with this since
a) reexecs of the user instance are not commonly done, at least package upgrade
   scripts don't do this afawk.
b) cgroups aren't delegateable on cgroupsv1 there's little reason to use "systemctl
   set-property" for --user mode

6 years agoshared/path-lookup: rearrange paths in --global mode to match --user mode
Zbigniew Jędrzejewski-Szmek [Thu, 8 Feb 2018 13:12:13 +0000 (14:12 +0100)] 
shared/path-lookup: rearrange paths in --global mode to match --user mode

It's not good if the paths are in different order. With --user, we expect
more paths, but it must be a strict superset, and the order for the ones
that appear in both sets must be the same.

$  diff -u <(build/systemd-analyze --global unit-paths) <(build/systemd-analyze --user unit-paths)|colordiff
--- /proc/self/fd/14 2018-02-08 14:11:45.425353107 +0100
+++ /proc/self/fd/15 2018-02-08 14:11:45.426353116 +0100
@@ -1,6 +1,17 @@
+/home/zbyszek/.config/systemd/system.control
+/run/user/1000/systemd/system.control
+/run/user/1000/systemd/transient
+/run/user/1000/systemd/generator.early
+/home/zbyszek/.config/systemd/user
 /etc/systemd/user
+/run/user/1000/systemd/user
 /run/systemd/user
+/run/user/1000/systemd/generator
+/home/zbyszek/.local/share/systemd/user
+/home/zbyszek/.local/share/flatpak/exports/share/systemd/user
+/var/lib/flatpak/exports/share/systemd/user
 /usr/local/share/systemd/user
 /usr/share/systemd/user
 /usr/local/lib/systemd/user
 /usr/lib/systemd/user
+/run/user/1000/systemd/generator.late

A test is added so that we don't regress on this.

6 years agopath-lookup: include paths from --global in --user search path too
Zbigniew Jędrzejewski-Szmek [Thu, 8 Feb 2018 12:57:05 +0000 (13:57 +0100)] 
path-lookup: include paths from --global in --user search path too

This doesn't matter that much, because set-property --global does not work,
so at least those paths wouldn't be used automatically. It is still possible
to create such snippets manually, so we better fix this.

6 years agopath-lookup: fix confusion between persistent_control and persistent_config
Zbigniew Jędrzejewski-Szmek [Thu, 8 Feb 2018 12:54:37 +0000 (13:54 +0100)] 
path-lookup: fix confusion between persistent_control and persistent_config

persistent_config would not appear in the search path at all, hence
those overrides would not work at all.

6 years agoshell-completion: add --global and unit-paths
Zbigniew Jędrzejewski-Szmek [Thu, 8 Feb 2018 11:09:28 +0000 (12:09 +0100)] 
shell-completion: add --global and unit-paths

6 years agoanalyze: add unit-paths verb
Zbigniew Jędrzejewski-Szmek [Fri, 9 Feb 2018 11:27:27 +0000 (12:27 +0100)] 
analyze: add unit-paths verb

6 years agoMerge pull request #8083 from shawnl/close-ssh
Lennart Poettering [Fri, 9 Feb 2018 11:17:26 +0000 (12:17 +0100)] 
Merge pull request #8083 from shawnl/close-ssh

sd-bus: cleanup ssh sessions (Closes: #8076)

6 years agoudevadm: check for oom and other style fixes 8066/head
Zbigniew Jędrzejewski-Szmek [Fri, 9 Feb 2018 11:04:03 +0000 (12:04 +0100)] 
udevadm: check for oom and other style fixes

6 years agoudevadm: allow trigger command to be synchronous
Mao [Thu, 1 Feb 2018 09:33:13 +0000 (17:33 +0800)] 
udevadm: allow trigger command to be synchronous

There are cases that we want to trigger and settle only specific
commands. For example, let's say at boot time we want to make sure all
the graphics devices are working correctly because it's critical for
booting, but not the USB subsystem (we'll trigger USB events later). So
we do:

  udevadm trigger --action="add" --subsystem-match="graphics"
  udevadm settle

However, we cannot block the kernel from emitting kernel events from
discovering USB devices. So if any of the USB kernel event was emitted
before the settle command, the settle command would still wait for the
entire queue to complete. And if the USB event takes a long time to be
processed, the system slows down.

The new `settle` option allows the `trigger` command to wait for only
the triggered events, and effectively solves this problem.

6 years agoMerge pull request #8142 from yuwata/sd-bus-memleak
Lennart Poettering [Fri, 9 Feb 2018 10:39:26 +0000 (11:39 +0100)] 
Merge pull request #8142 from yuwata/sd-bus-memleak

Fix potential memory leaks and several code style updates

6 years agofs-util: drop readlink_and_make_absolute_root()
Yu Watanabe [Fri, 9 Feb 2018 07:58:56 +0000 (16:58 +0900)] 
fs-util: drop readlink_and_make_absolute_root()

6 years agofs-util: drop readlink_and_canonicalize()
Yu Watanabe [Fri, 9 Feb 2018 07:49:54 +0000 (16:49 +0900)] 
fs-util: drop readlink_and_canonicalize()

6 years agocore: remove unnecessary initialization 8142/head
Yu Watanabe [Fri, 9 Feb 2018 07:36:37 +0000 (16:36 +0900)] 
core: remove unnecessary initialization

6 years agoudev: use "#pragma once"
Yu Watanabe [Fri, 9 Feb 2018 07:33:30 +0000 (16:33 +0900)] 
udev: use "#pragma once"

6 years agosd-bus: explicitly convert int to bool
Yu Watanabe [Fri, 9 Feb 2018 07:19:11 +0000 (16:19 +0900)] 
sd-bus: explicitly convert int to bool

6 years agosd-bus: use free_and_replace()
Yu Watanabe [Fri, 9 Feb 2018 07:21:51 +0000 (16:21 +0900)] 
sd-bus: use free_and_replace()

6 years agosd-bus: avoid potential memory leaks
Yu Watanabe [Fri, 9 Feb 2018 07:21:29 +0000 (16:21 +0900)] 
sd-bus: avoid potential memory leaks

6 years agoman: fix capability name in man:systemd-tmpfiles(8) (#8139)
Lucas Werkmeister [Fri, 9 Feb 2018 02:05:49 +0000 (03:05 +0100)] 
man: fix capability name in man:systemd-tmpfiles(8) (#8139)

CAP_ADMIN does not exist (the closest existing capability name would be
CAP_SYS_ADMIN), and according to man:open(2) and man:capabilities(7),
the capability required to specify O_NOATIME is actually CAP_FOWNER.

6 years agoPeriodically call sd_journal_process in journalctl
Peter Portante [Sun, 28 Jan 2018 21:48:04 +0000 (16:48 -0500)] 
Periodically call sd_journal_process in journalctl

If `journalctl` take a long time to process messages, and during that
time journal file rotation occurs, a `journalctl` client will keep
those rotated files open until it calls `sd_journal_process()`, which
typically happens as a result of calling `sd_journal_wait()` below in
the "following" case.  By periodically calling `sd_journal_process()`
during the processing loop we shrink the window of time a client
instance has open file descriptors for rotated (deleted) journal
files.

**Warning**

This change does not appear to solve the case of a "paused" output
stream. If somebody is using `journalctl | less` and pauses the
output, then without a background thread periodically listening for
inotify delete events and cleaning up, journal logs will eventually
stop flowing in cases where a journal client with enough open files
causes the "free" disk space threshold to be crossed.

6 years agosd-bus: cleanup ssh sessions (Closes: #8076) 8083/head
Shawn Landden [Sat, 3 Feb 2018 18:16:33 +0000 (10:16 -0800)] 
sd-bus: cleanup ssh sessions (Closes: #8076)

we still invoke ssh unnecessarily when there in incompatible or erreneous input
The fallow-up to finish that would make the code a bit more verbose,
as it would require repeating this bit:
```
        r = bus_connect_transport(arg_transport, arg_host, false, &bus);
        if (r < 0) {
                log_error_errno(r, "Failed to create bus connection: %m");
                goto finish;
        }

        sd_bus_set_allow_interactive_authorization(bus, arg_ask_password);
```
in every verb, after parsing.

v2: add waitpid() to avoid a zombie process, switch to SIGTERM from SIGKILL
v3: refactor, wait in bus_start_address()

6 years agomachine: add some missing asserts
Shawn Landden [Sat, 3 Feb 2018 03:14:32 +0000 (19:14 -0800)] 
machine: add some missing asserts

6 years agoanalyze: add --global option
Zbigniew Jędrzejewski-Szmek [Thu, 8 Feb 2018 10:53:00 +0000 (11:53 +0100)] 
analyze: add --global option

This is somewhat useful for 'verify', and will be used later with 'unit-paths'.

6 years agotree-wide: use "cannot" instead of "can not"
Zbigniew Jędrzejewski-Szmek [Thu, 8 Feb 2018 09:34:52 +0000 (10:34 +0100)] 
tree-wide: use "cannot" instead of "can not"

This is the usual spelling, and a bit shorter.

6 years agonetworkd: vxlan require Remote= to be a non multicast address (#8117)
Susant Sahani [Thu, 8 Feb 2018 09:22:46 +0000 (14:52 +0530)] 
networkd: vxlan require Remote= to be a non multicast address (#8117)

Remote= must be a non multicast address. ip-link(8) says:
> remote IPADDR - specifies the unicast destination IP address to
>                      use in outgoing packets when the destination link layer address
>                      is not known in the VXLAN device forwarding database.

Closes #8088.

6 years agoman: .service <filename> to <literal> (#8126)
Faalagorn [Thu, 8 Feb 2018 08:14:55 +0000 (09:14 +0100)] 
man: .service <filename> to <literal> (#8126)

Changed <filename>.service</filename> to <literal>.service</literal> to match style in other manual pages: man 5 systemd.socket, device, mount, automount, swap, target path, timer, slice and scope.

6 years agojournal: avoid code that relies on LOG_KERN == 0 (#8110)
Alan Jenkins [Thu, 8 Feb 2018 08:14:32 +0000 (08:14 +0000)] 
journal: avoid code that relies on LOG_KERN == 0 (#8110)

LOG_FAC() is the general way to extract the logging facility (when it has
been combined with the logging priority).

LOG_FACMASK can be used to mask off the priority so you only have the
logging facility bits... but to get the logging facility e.g. LOG_USER,
you also have to bitshift it as well.  (The priority is in the low bits,
and so only requires masking).

((priority & LOG_FACMASK) == LOG_KERN) happens to work only because
LOG_KERN is 0, and hence has the same value with or without the bitshift.

Code that relies on weird assumptions like this could make it harder to
realize how the logging values are treated.

6 years agoMerge pull request #8042 from zx2c4-forks/jd/networkctl-type
Zbigniew Jędrzejewski-Szmek [Thu, 8 Feb 2018 08:12:31 +0000 (09:12 +0100)] 
Merge pull request #8042 from zx2c4-forks/jd/networkctl-type

networkd: fixup networkctl type display

6 years agoman: "reboot" to "power off" in poweroff.target (#8124)
Faalagorn [Wed, 7 Feb 2018 18:10:41 +0000 (19:10 +0100)] 
man: "reboot" to "power off" in poweroff.target (#8124)

Changed "reboot" to "power off" in poweroff.target description. It was most likely copied and pasted from the reboot.target below, compare with e.g. halt.target

6 years agocore: use id unit when retrieving unit file state (#8038)
Franck Bui [Wed, 7 Feb 2018 13:08:02 +0000 (14:08 +0100)] 
core: use id unit when retrieving unit file state (#8038)

Previous code was using the basename(id->fragment_path) which returned
incorrect result if the unit was an instance.

For example, assuming that no instances of "template" have been created so far:

 $ systemctl enable template@1
 Created symlink from /etc/systemd/system/multi-user.target.wants/template@1.service to /usr/lib/systemd/system/template@.service.

 $ systemctl is-enabled template@3.service
 disabled

 $ systemctl status template@3.service
 ● template@3.service - openQA Worker #3
    Loaded: loaded (/usr/lib/systemd/system/template@.service; enabled; vendor preset: disabled)
    [...]

Here the unit file states reported by "status" and "is-enabled" were different.

6 years agoMerge pull request #8104 from keszybz/tmpfiles-allow-overrides
Lennart Poettering [Wed, 7 Feb 2018 11:12:52 +0000 (12:12 +0100)] 
Merge pull request #8104 from keszybz/tmpfiles-allow-overrides

tmpfiles allow overrides

6 years agoprocess-util: use raw_getpid() in getpid_cache() internally (#8115)
Lennart Poettering [Wed, 7 Feb 2018 02:10:09 +0000 (03:10 +0100)] 
process-util: use raw_getpid() in getpid_cache() internally (#8115)

We have the raw_getpid() definition in place anyway, and it's certainly
beneficial to expose the same semantics on pre glibc 2.24 and after it
too, hence always bypass glibc for this, and always cache things on our
side.

Fixes: #8113
6 years agocore: Avoid empty directory warning when we are bind-mounting a file (#8069)
Andrei Gherzan [Tue, 6 Feb 2018 15:35:52 +0000 (15:35 +0000)] 
core: Avoid empty directory warning when we are bind-mounting a file (#8069)

6 years agoMerge pull request #8044 from yuwata/fix-7790
Zbigniew Jędrzejewski-Szmek [Tue, 6 Feb 2018 10:03:02 +0000 (11:03 +0100)] 
Merge pull request #8044 from yuwata/fix-7790

 core: make ExecRuntime be manager managed object

6 years agoMerge pull request #8107 from sourcejedi/pedant
Zbigniew Jędrzejewski-Szmek [Tue, 6 Feb 2018 09:17:05 +0000 (10:17 +0100)] 
Merge pull request #8107 from sourcejedi/pedant

core: a couple of tidyups to synthesized units

6 years agoAdd more file triggers to handle more aspects of systemd (#8090)
Neal Gompa (ニール・ゴンパ) [Tue, 6 Feb 2018 09:11:36 +0000 (04:11 -0500)] 
Add more file triggers to handle more aspects of systemd (#8090)

For quite a while now, there have been file triggers to handle
automatically setting up service units in upstream systemd. However,
most of the actions being done by these macros upon files can be set up
as RPM file triggers.

In fact, in Mageia, we had been doing this for most of these. In particular,
we have file triggers in place for sysusers, tmpfiles, hwdb, and the journal.

This change adds Lua versions of the original file triggers used in Mageia,
based on the existing Lua-based file triggers for service units.

In addition, we can also have useful file triggers for udev rules, sysctl
directives, and binfmt directives. These are based on the other existing
file triggers.

6 years agoMerge pull request #8112 from yuwata/gcc-warning
Zbigniew Jędrzejewski-Szmek [Tue, 6 Feb 2018 09:09:29 +0000 (10:09 +0100)] 
Merge pull request #8112 from yuwata/gcc-warning

Fix gcc warnings

6 years agonss-mymachines: add work-around to silence gcc warning 8112/head
Yu Watanabe [Tue, 6 Feb 2018 08:08:38 +0000 (17:08 +0900)] 
nss-mymachines: add work-around to silence gcc warning

This is similar to 3c3d384ae93700ef08545b078c37065fdb98eee7 and
a workaround for the following warning.
```
In file included from ../src/basic/in-addr-util.h:28,
                 from ../src/nss-mymachines/nss-mymachines.c:31:
../src/nss-mymachines/nss-mymachines.c: In function '_nss_mymachines_getgrnam_r':
../src/nss-mymachines/nss-mymachines.c:653:32: warning: argument to 'sizeof' in 'memset' call is the same pointer type 'char *' as the destination; expected 'char' or an explicit length [-Wsizeof-pointer-memaccess]
         memzero(buffer, sizeof(char*));
                                ^~~~
../src/basic/util.h:118:39: note: in definition of macro 'memzero'
 #define memzero(x,l) (memset((x), 0, (l)))
                                       ^
../src/nss-mymachines/nss-mymachines.c: In function '_nss_mymachines_getgrgid_r':
../src/nss-mymachines/nss-mymachines.c:730:32: warning: argument to 'sizeof' in 'memset' call is the same pointer type 'char *' as the destination; expected 'char' or an explicit length [-Wsizeof-pointer-memaccess]
         memzero(buffer, sizeof(char*));
                                ^~~~
../src/basic/util.h:118:39: note: in definition of macro 'memzero'
 #define memzero(x,l) (memset((x), 0, (l)))
                                       ^
```

6 years agonetworkd: fix dhcp6_prefixes_compare_func()
Yu Watanabe [Tue, 6 Feb 2018 08:05:58 +0000 (17:05 +0900)] 
networkd: fix dhcp6_prefixes_compare_func()

Found by the following warning by gcc.
```
../src/network/networkd-manager.c: In function 'dhcp6_prefixes_compare_func':
../src/network/networkd-manager.c:1383:16: warning: 'memcmp' reading 16 bytes from a region of size 8 [-Wstringop-overflow=]
         return memcmp(&a, &b, sizeof(*a));
                ^
```

6 years agocore/execute: make arguments constant if possible 8044/head
Yu Watanabe [Tue, 6 Feb 2018 03:17:50 +0000 (12:17 +0900)] 
core/execute: make arguments constant if possible

Also make functions static if possible.

6 years agocore: make ExecRuntime be manager managed object
Yu Watanabe [Tue, 6 Feb 2018 07:00:34 +0000 (16:00 +0900)] 
core: make ExecRuntime be manager managed object

Before this, each ExecRuntime object is owned by a unit. However,
it may be shared with other units which enable JoinsNamespaceOf=.
Thus, by the serialization/deserialization process, its sharing
information, more specifically, reference counter is lost, and
causes issue #7790.

This makes ExecRuntime objects be managed by manager, and changes
the serialization/deserialization process.

Fixes #7790.

6 years agoMerge pull request #8101 from keszybz/two-gcc-workarounds
Lennart Poettering [Mon, 5 Feb 2018 17:59:52 +0000 (18:59 +0100)] 
Merge pull request #8101 from keszybz/two-gcc-workarounds

Two gcc workarounds

6 years agojournal: include kmsg lines from the systemd process which exec()d us (#8078)
Alan Jenkins [Mon, 5 Feb 2018 16:53:40 +0000 (16:53 +0000)] 
journal: include kmsg lines from the systemd process which exec()d us (#8078)

Let the journal capture messages emitted by systemd, before it ran
exec("/usr/lib/systemd/systemd-journald").  Usually such messages will only
appear with `systemd.log_level=debug`.  kmsg lines written after the exec()
will be ignored as before.

In other words, we are avoiding reading our own lines, which start
"systemd-journald[100]: " assuming we are PID 100.  But now we will start
allowing ourself to read lines which start "systemd[100]: ", or any other
prefix which is not "systemd-journald[100]: ".

So this can't help you see messages when we fail to exec() journald :). But,
it makes it easier to see what the pre-exec() messages look like in
the successful case.  Comparing messages like this can be useful when
debugging.  Noticing weird omissions of messages, otoh, makes me anxious.

6 years agohwdb: fix mute microphone button on TravelMate P645-S (#8105)
CuBiC [Mon, 5 Feb 2018 16:43:23 +0000 (17:43 +0100)] 
hwdb: fix mute microphone button on TravelMate P645-S (#8105)

6 years agonss-systemd: add work-around to silence gcc warning 8101/head
Zbigniew Jędrzejewski-Szmek [Mon, 5 Feb 2018 10:07:40 +0000 (11:07 +0100)] 
nss-systemd: add work-around to silence gcc warning

In file included from ../src/basic/fs-util.h:32,
                 from ../src/nss-systemd/nss-systemd.c:28:
../src/nss-systemd/nss-systemd.c: In function '_nss_systemd_getgrnam_r':
../src/nss-systemd/nss-systemd.c:416:32: warning: argument to 'sizeof' in 'memset' call is the same pointer type 'char *' as the destination; expected 'char' or an explicit length [-Wsizeof-pointer-memaccess]
         memzero(buffer, sizeof(char*));
                                ^~~~
../src/basic/util.h:118:39: note: in definition of macro 'memzero'
 #define memzero(x,l) (memset((x), 0, (l)))
                                       ^

gcc is trying to be helpful, and it's not far from being right. It _looks_ like
sizeof(char*) is an error, but in this case we're really leaving a space empty
for a pointer, and our calculation is correct. Since this is a short file,
let's just use simplest option and turn off the warning above the two functions
that trigger it.

6 years agobasic/glob-util: add closedir wrapper to silence gcc
Zbigniew Jędrzejewski-Szmek [Mon, 5 Feb 2018 09:55:24 +0000 (10:55 +0100)] 
basic/glob-util: add closedir wrapper to silence gcc

../src/test/test-glob-util.c: In function 'test_glob_no_dot':
../src/test/test-glob-util.c:61:32: warning: cast between incompatible function types from 'int (*)(DIR *)' {aka 'int (*)(struct __dirstream *)'} to 'void (*)(void *)' [-Wcast-function-type]
                 .gl_closedir = (void (*)(void *)) closedir,
                                ^

6 years agorpm macros: add %tmpfiles_create_package 8104/head
Zbigniew Jędrzejewski-Szmek [Mon, 5 Feb 2018 14:02:07 +0000 (15:02 +0100)] 
rpm macros: add %tmpfiles_create_package

I expect that this will be mostly obsoleted by transfiletriggers that
(I hope) we will soon add. But let's do this for completeness anyway.
I'm keeping the description of the macro a bit vague, since I expect
that it'll be changed when transfiletriggers are added.

6 years agotmpfiles: allow admin/runtime overrides to runtime config
Zbigniew Jędrzejewski-Szmek [Mon, 5 Feb 2018 13:53:11 +0000 (14:53 +0100)] 
tmpfiles: allow admin/runtime overrides to runtime config

This is very similar to d16a1c1bb6. For tmpfiles this is much less useful
compared to sysusers, but let's add this anyway for consistency.

6 years agoMerge pull request #8077 from sourcejedi/seccomp_cosmetic
Lennart Poettering [Mon, 5 Feb 2018 12:52:23 +0000 (13:52 +0100)] 
Merge pull request #8077 from sourcejedi/seccomp_cosmetic

seccomp: allow x86-64 syscalls on x32, used by the VDSO (fix #8060)

6 years agoMerge pull request #8100 from keszybz/free-gcrypt-context
Lennart Poettering [Mon, 5 Feb 2018 12:47:29 +0000 (13:47 +0100)] 
Merge pull request #8100 from keszybz/free-gcrypt-context

Free gcrypt contexts properly

6 years agohwdb: added Cube i7 Book rotation info (#8103)
Olof Mogren [Mon, 5 Feb 2018 10:52:43 +0000 (11:52 +0100)] 
hwdb: added Cube i7 Book rotation info (#8103)

6 years agoresolved: use _cleanup_ in one more place 8100/head
Zbigniew Jędrzejewski-Szmek [Mon, 5 Feb 2018 09:07:39 +0000 (10:07 +0100)] 
resolved: use _cleanup_ in one more place

No functional change.

6 years agoresolved: fix memleak of gcrypt context on error
Zbigniew Jędrzejewski-Szmek [Mon, 5 Feb 2018 09:06:36 +0000 (10:06 +0100)] 
resolved: fix memleak of gcrypt context on error

Bug found by Stef Bon <stefbon@gmail.com>. Thanks!

6 years agogcrypt-util: fix memleak
Zbigniew Jędrzejewski-Szmek [Mon, 5 Feb 2018 08:54:57 +0000 (09:54 +0100)] 
gcrypt-util: fix memleak

6 years agotest: add a simple smoke test for string_hashsum()
Zbigniew Jędrzejewski-Szmek [Mon, 5 Feb 2018 08:48:38 +0000 (09:48 +0100)] 
test: add a simple smoke test for string_hashsum()

This is enough to show memory leakages pointed out by Stef Bon <stefbon@gmail.com>.

6 years agoMerge pull request #8058 from keszybz/sysusers-inline
Yu Watanabe [Mon, 5 Feb 2018 07:50:51 +0000 (16:50 +0900)] 
Merge pull request #8058 from keszybz/sysusers-inline

Extend sysusers for package installation scripts

6 years agoman: document meaning of age in tmpfiles.d (#8092)
Lucas Werkmeister [Mon, 5 Feb 2018 07:19:09 +0000 (08:19 +0100)] 
man: document meaning of age in tmpfiles.d (#8092)

This documents how the age of a file is determined, which previously was
only alluded to in other parts of the documentation. Fixes #8091.

The phrasings of “last modification timestamp” etc. are taken from
man:inode(7) (as of man-pages 4.14). The debug messages in tmpfiles.c
use different messages (“modify time”), which according to a code
comment follow man:stat(1); however, my copy of that manpage (from GNU
coreutils 8.29) documents %y as “time of last data modification”
instead.

6 years agoMerge pull request #8065 from yuwata/fix-8064
Zbigniew Jędrzejewski-Szmek [Mon, 5 Feb 2018 07:17:26 +0000 (08:17 +0100)] 
Merge pull request #8065 from yuwata/fix-8064

systemctl: update 'show' command formats

6 years agotest: sort imports and use "new" string formatting
Batuhan Osman Taşkaya [Mon, 5 Feb 2018 06:28:53 +0000 (09:28 +0300)] 
test: sort imports and use "new" string formatting

Followed PEP8 and PEP3101 rules (#8079)
Imports re-ordered by Alphabetical Standarts for following PEP8
Old type string formattings (" example %s " % exampleVar ) re-writed as new type string
formattings ( " example {} ".format(exampleVar) ) for following PEP3101

6 years agosystemctl: show: use EnvironmentFiles= instead of EnvironmentFile= 8065/head
Yu Watanabe [Thu, 1 Feb 2018 10:39:30 +0000 (19:39 +0900)] 
systemctl: show: use EnvironmentFiles= instead of EnvironmentFile=

EnvironmentFile= is used in the unit file, but in the dbus,
the related field name is EnvironmentFiles=.
As the other variables, let's use the field name instead of the name
used in the unit file setting.

6 years agosystemctl: update 'show' format for path units
Yu Watanabe [Thu, 1 Feb 2018 06:22:00 +0000 (15:22 +0900)] 
systemctl: update 'show' format for path units

Before this.
```
$ systemctl show cups.path | grep ^Path
PathExistsGlob=/var/spool/cups/d*
$ systemctl show --property PathExistsGlob cups.path
$ systemctl show --property Paths cups.path
PathExistsGlob=/var/spool/cups/d*
```

After this.
```
$ systemctl show cups.path | grep ^Path
Paths=/var/spool/cups/d* (PathExistsGlob)
$ systemctl show --property Paths cups.path
Paths=/var/spool/cups/d* (PathExistsGlob)
```

6 years agosystemctl: update 'show' format for socket units
Yu Watanabe [Thu, 1 Feb 2018 06:18:17 +0000 (15:18 +0900)] 
systemctl: update 'show' format for socket units

Before this.
```
$ systemctl show systemd-journald.socket | grep Listen
ListenStream=/run/systemd/journal/stdout
ListenDatagram=/run/systemd/journal/socket
$ systemctl show --property ListenStream systemd-journald.socket
$ systemctl show --property ListenDatagram systemd-journald.socket
$ systemctl show --property Listen systemd-journald.socket
ListenStream=/run/systemd/journal/stdout
ListenDatagram=/run/systemd/journal/socket
```

After this.
```
$ systemctl show systemd-journald.socket | grep Listen
Listen=/run/systemd/journal/stdout (Stream)
Listen=/run/systemd/journal/socket (Datagram)
$ systemctl show --property Listen systemd-journald.socket
ListenStream=/run/systemd/journal/stdout
ListenDatagram=/run/systemd/journal/socket
```

Fixes #8064.