platform/upstream/systemd.git
7 years agocore: minor coding style/wording fixes
Lennart Poettering [Thu, 8 Dec 2016 16:23:08 +0000 (17:23 +0100)]
core: minor coding style/wording fixes

7 years agoutil-lib: beef path_is_os_tree() up a bit
Lennart Poettering [Thu, 8 Dec 2016 16:19:27 +0000 (17:19 +0100)]
util-lib: beef path_is_os_tree() up a bit

Let's use chase_symlinks() when looking for /etc/os-release and
/usr/lib/os-release as these files might be symlinks (and actually are IRL on
some distros).

7 years agoutil-lib: accept invoking chase_symlinks() with a NULL return parameter
Lennart Poettering [Thu, 8 Dec 2016 16:15:06 +0000 (17:15 +0100)]
util-lib: accept invoking chase_symlinks() with a NULL return parameter

Let's permit invoking chase_symlinks() with a NULL return parameter. If so, the
resolved name is not returned, and call is useful for checking for existance of
a file, without actually returning its ultimate path.

7 years agocore: add comment why we don't bother with MS_SHARED remounting of / in containers
Lennart Poettering [Thu, 8 Dec 2016 09:51:32 +0000 (10:51 +0100)]
core: add comment why we don't bother with MS_SHARED remounting of / in containers

7 years agoshared: use uid_is_valid() for checking validity of UIDs
Lennart Poettering [Thu, 8 Dec 2016 09:50:29 +0000 (10:50 +0100)]
shared: use uid_is_valid() for checking validity of UIDs

7 years agonspawn: split out VolatileMode definitions
Lennart Poettering [Wed, 7 Dec 2016 23:28:05 +0000 (00:28 +0100)]
nspawn: split out VolatileMode definitions

This moves the VolatileMode enum and its helper functions to src/shared/. This
is useful to then reuse them to implement systemd.volatile= in a later commit.

7 years agoman/journalctl: mention systemd-journal-remote(8) (#4929)
Baruch Siach [Tue, 20 Dec 2016 13:59:26 +0000 (15:59 +0200)]
man/journalctl: mention systemd-journal-remote(8) (#4929)

Make it easier to figure out how to use the journalctl export format.

7 years agoMerge pull request #4904 from dobyrch/calendar-range-step
Lennart Poettering [Tue, 20 Dec 2016 10:14:59 +0000 (11:14 +0100)]
Merge pull request #4904 from dobyrch/calendar-range-step

calendarspec: allow repetition values with ranges

7 years agosystemctl: do not segfault when we cannot find template unit (#4915)
Zbigniew Jędrzejewski-Szmek [Tue, 20 Dec 2016 10:09:59 +0000 (05:09 -0500)]
systemctl: do not segfault when we cannot find template unit (#4915)

Core was generated by `systemctl cat test@.target test@.service'.
Program terminated with signal SIGSEGV, Segmentation fault.
32              movdqu  (%rdi), %xmm0
(gdb) bt
-0  strrchr () at ../sysdeps/x86_64/strrchr.S:32
-1  0x00007f57fdf837fe in __GI___basename (filename=0x0) at basename.c:24
-2  0x000055b8a77d0d91 in unit_find_paths (bus=0x55b8a9242f90, unit_name=0x55b8a92428f0 "test@.service", lp=0x7ffdc9070400, fragment_path=0x7ffdc90703e0, dropin_paths=0x7ffdc90703e8) at src/systemctl/systemctl.c:2584
-3  0x000055b8a77dbae5 in cat (argc=3, argv=0x7ffdc9070678, userdata=0x0) at src/systemctl/systemctl.c:5324
-4  0x00007f57fe55fc6b in dispatch_verb (argc=5, argv=0x7ffdc9070668, verbs=0x55b8a77f1c60 <verbs>, userdata=0x0) at src/basic/verbs.c:92
-5  0x000055b8a77e477f in systemctl_main (argc=5, argv=0x7ffdc9070668) at src/systemctl/systemctl.c:8141
-6  0x000055b8a77e5572 in main (argc=5, argv=0x7ffdc9070668) at src/systemctl/systemctl.c:8412

The right behaviour is not easy in this case. Implement some "sensible" logic.

Fixes #4912.

7 years agobuild-sys: revert dbus >= 1.9.18 requirement (#4924)
Mike Gilbert [Tue, 20 Dec 2016 09:53:53 +0000 (04:53 -0500)]
build-sys: revert dbus >= 1.9.18 requirement (#4924)

Instead, document the necessary step to utilize older dbus versions.

7 years agoMerge pull request #4926 from whot/hwdb-updates
Martin Pitt [Tue, 20 Dec 2016 07:18:06 +0000 (08:18 +0100)]
Merge pull request #4926 from whot/hwdb-updates

Hwdb updates

7 years agohwdb: axis override for HP Spectre
Peter Hutterer [Thu, 8 Dec 2016 00:25:49 +0000 (10:25 +1000)]
hwdb: axis override for HP Spectre

https://bugzilla.redhat.com/show_bug.cgi?id=1402596

7 years agohwdb: add axis overrides for Asus Vivobook E402SA
Peter Hutterer [Fri, 2 Dec 2016 03:44:09 +0000 (13:44 +1000)]
hwdb: add axis overrides for Asus Vivobook E402SA

7 years agohwdb: add axis override for Lenovo W530
Peter Hutterer [Thu, 1 Dec 2016 00:38:08 +0000 (10:38 +1000)]
hwdb: add axis override for Lenovo W530

https://bugs.freedesktop.org/show_bug.cgi?id=98844

7 years agohwdb: add axis override for Toshiba Tecra M11
Peter Hutterer [Wed, 30 Nov 2016 00:25:15 +0000 (10:25 +1000)]
hwdb: add axis override for Toshiba Tecra M11

7 years agonetworkd-ndisc: handle missing mtu gracefully (#4913)
Jörg Thalheim [Mon, 19 Dec 2016 14:34:07 +0000 (15:34 +0100)]
networkd-ndisc: handle missing mtu gracefully (#4913)

At least bird's implementation of router advertisement does not
set MTU option by default (instead it supplies an option to the user).
In this case just leave MTU as it is.

7 years agobuild-sys: treat format errors as fatal (#4910)
Zbigniew Jędrzejewski-Szmek [Sun, 18 Dec 2016 20:47:41 +0000 (15:47 -0500)]
build-sys: treat format errors as fatal (#4910)

We currently don't expect any warnings about format strings, on any
architecture (#4612 removed the last few warnings). Turn those warnings into
errors in the future.

As requested by Martin Pitt.

gcc documentation says that -Wformat=2 includes -Wformat-security and
-Wformat-nonliteral so don't include them explicitly.

7 years agoMerge pull request #4892 from poettering/buspolicymove
Zbigniew Jędrzejewski-Szmek [Sun, 18 Dec 2016 16:43:18 +0000 (11:43 -0500)]
Merge pull request #4892 from poettering/buspolicymove

build-sys: stop placing D-Bus policy below /etc

7 years agocore: downgrade "Time has been changed" to debug (#4906)
Zbigniew Jędrzejewski-Szmek [Sun, 18 Dec 2016 12:21:19 +0000 (07:21 -0500)]
core: downgrade "Time has been changed" to debug (#4906)

That message is emitted by every systemd instance on every resume:
Dec 06 08:03:38 laptop systemd[1]: Time has been changed
Dec 06 08:03:38 laptop systemd[823]: Time has been changed
Dec 06 08:03:38 laptop systemd[916]: Time has been changed
Dec 07 08:00:32 laptop systemd[1]: Time has been changed
Dec 07 08:00:32 laptop systemd[823]: Time has been changed
Dec 07 08:00:32 laptop systemd[916]: Time has been changed
-- Reboot --
Dec 07 08:02:46 laptop systemd[836]: Time has been changed
Dec 07 08:02:46 laptop systemd[1]: Time has been changed
Dec 07 08:02:46 laptop systemd[926]: Time has been changed
Dec 07 19:48:12 laptop systemd[1]: Time has been changed
Dec 07 19:48:12 laptop systemd[836]: Time has been changed
Dec 07 19:48:12 laptop systemd[926]: Time has been changed
...

Fixes #4896.

7 years agoMerge pull request #4911 from keszybz/fixlets
Martin Pitt [Sun, 18 Dec 2016 12:20:12 +0000 (13:20 +0100)]
Merge pull request #4911 from keszybz/fixlets

A few simple fixes / improvements

7 years agobasic/log: use IN_SET
Zbigniew Jędrzejewski-Szmek [Sun, 18 Dec 2016 00:55:43 +0000 (19:55 -0500)]
basic/log: use IN_SET

7 years agotest-compress: fix warning about LZ4_compress_limitedOutput
Zbigniew Jędrzejewski-Szmek [Sat, 17 Dec 2016 23:27:01 +0000 (18:27 -0500)]
test-compress: fix warning about LZ4_compress_limitedOutput

691b90d465 fixed one spot, but missed the other one.

7 years agocore: remove spurious newline
Zbigniew Jędrzejewski-Szmek [Fri, 16 Dec 2016 21:08:51 +0000 (16:08 -0500)]
core: remove spurious newline

7 years agodebug-generator: simplify handling of arg_default_unit
Zbigniew Jędrzejewski-Szmek [Fri, 16 Dec 2016 21:03:31 +0000 (16:03 -0500)]
debug-generator: simplify handling of arg_default_unit

Also free the allocated memory before exiting.

7 years agoUse SPECIAL_DEFAULT_TARGET consistently
Zbigniew Jędrzejewski-Szmek [Fri, 16 Dec 2016 20:55:27 +0000 (15:55 -0500)]
Use SPECIAL_DEFAULT_TARGET consistently

7 years agoModify mount_propagation_flags_from_string to return a normal int code
Zbigniew Jędrzejewski-Szmek [Sat, 3 Dec 2016 18:57:42 +0000 (13:57 -0500)]
Modify mount_propagation_flags_from_string to return a normal int code

This means that callers can distiguish an error from flags==0,
and don't have to special-case the empty string.

7 years agoMerge pull request #4845 from poettering/various-smaller-fixes
Zbigniew Jędrzejewski-Szmek [Sat, 17 Dec 2016 18:36:00 +0000 (13:36 -0500)]
Merge pull request #4845 from poettering/various-smaller-fixes

Various smaller fixes

7 years agocoredumpctl: let gdb handle the SIGINT signal (#4901)
Franck Bui [Sat, 17 Dec 2016 14:49:17 +0000 (15:49 +0100)]
coredumpctl: let gdb handle the SIGINT signal (#4901)

Even if pressing Ctrl-c after spawning gdb with "coredumpctl gdb" is not really
useful, we should let gdb handle the signal entirely otherwise the user can be
suprised to see a different behavior when gdb is started by coredumpctl vs when
it's started directly.

Indeed in the former case, gdb exits due to coredumpctl being killed by the
signal.

So this patch makes coredumpctl ignore SIGINT as long as gdb is running.

7 years agoREADME: bump dbus dep
Zbigniew Jędrzejewski-Szmek [Sat, 17 Dec 2016 14:26:40 +0000 (09:26 -0500)]
README: bump dbus dep

We should also mention this in NEWS before release. Suggested text:
> DBus policy files are now installed into /usr rather than /etc. Make sure
> your system has dbus = 1.9.18 running before upgrading to this version, or
> override the install path with --with-dbuspolicydir=

7 years agocalendarspec: remove superfluous variables
Douglas Christman [Fri, 16 Dec 2016 17:36:15 +0000 (12:36 -0500)]
calendarspec: remove superfluous variables

7 years agocalendarspec: rename fields of CalendarComponent
Douglas Christman [Fri, 16 Dec 2016 20:49:54 +0000 (15:49 -0500)]
calendarspec: rename fields of CalendarComponent

value/range_end -> start/stop

7 years agocalendarspec: allow repetition values with ranges
Douglas Christman [Fri, 16 Dec 2016 01:02:10 +0000 (20:02 -0500)]
calendarspec: allow repetition values with ranges

"Every other hour from 9 until 5" can be written as
`9..17/2:00` instead of `9,11,13,15,17:00`

7 years agocore: make mount units from /proc/self/mountinfo possibly bind to a device (#4515)
Franck Bui [Fri, 16 Dec 2016 16:13:58 +0000 (17:13 +0100)]
core: make mount units from /proc/self/mountinfo possibly bind to a device (#4515)

Since commit 9d06297, mount units from mountinfo are not bound to their devices
anymore (they use the "Requires" dependency instead).

This has the following drawback: if a media is mounted and the eject button is
pressed then the media is unconditionally ejected leaving some inconsistent
states.

Since udev is the component that is reacting (no matter if the device is used
or not) to the eject button, users expect that udev at least try to unmount the
media properly.

This patch introduces a new property "SYSTEMD_MOUNT_DEVICE_BOUND". When set on
a block device, all units that requires this device will see their "Requires"
dependency upgraded to a "BindTo" one. This is currently only used by cdrom
devices.

This patch also gives the possibility to the user to restore the previous
behavior that is bind a mount unit to a device. This is achieved by passing the
"x-systemd.device-bound" option to mount(8). Please note that currently this is
not working because libmount treats the x-* options has comments therefore
they're not available in utab for later application retrievals.

7 years agobootctl: fix typo (#4897)
Lucas Werkmeister [Fri, 16 Dec 2016 14:41:31 +0000 (15:41 +0100)]
bootctl: fix typo (#4897)

7 years agocore: prevent invalid socket symlink target dereference (#4895)
Stefan Hajnoczi [Fri, 16 Dec 2016 10:20:27 +0000 (10:20 +0000)]
core: prevent invalid socket symlink target dereference (#4895)

socket_find_symlink_target() returns a pointer to
p->address.sockaddr.un.sun_path when the first byte is non-zero without
checking that this is AF_UNIX socket.  Since sockaddr is a union this
byte could be non-zero for AF_INET sockets.

Existing callers happen to be safe but is an accident waiting to happen.
Use socket_address_get_path() since it checks for AF_UNIX.

7 years agorules: identify internal sound cards on platform bus (#4893)
Daniel Drake [Thu, 15 Dec 2016 22:11:11 +0000 (16:11 -0600)]
rules: identify internal sound cards on platform bus (#4893)

We have a system which has the HDMI audio capability internally,
but pulseaudio is not giving it a very high priority compared
to e.g. USB sound cards.

The sound device appears on the platform bus and it is not
currently tagged with any form factor information.

It seems safe to assume that any sound card that is directly on the
platform bus is of internal form factor, but we must be careful because
udev rules will match all parent devices, not just the immediate parent,
and you will frequently encounter setups such as:

 Platform bus -> USB host controller -> USB sound card

In that case, SUBSYSTEMS==platform would match even though we're
clearly working with an external USB sound card.

In order to detect true platform devices here, we rely on the observation
that if any parent devices of the sound card are PCI, USB or firewire
devices, then this sound card cannot directly connected to the platform
bus. Otherwise, if we find a parent device on the platform bus, we assume
this is an internal sound card connected directly to the platform bus.

7 years agobuild-sys: stop placing D-Bus policy below /etc
Lennart Poettering [Mon, 12 Dec 2016 18:16:33 +0000 (19:16 +0100)]
build-sys: stop placing D-Bus policy below /etc

Let's start placing our D-Bus policy files in /usr rather than /etc. D-Bus
supports this since 1.9.18, and moving our files over means we continue to work
even if /etc is flushed out entirely (for example if systemd-nspawn's
--volatile= switch is used).

Since 1.9.18 was released summer 2015 it should be fine to require a newer
version like this for our builds.

https://lists.freedesktop.org/archives/dbus/2015-July/016746.html

7 years agocalendarspec: free memory when parsing fails (#4890)
Doug Christman [Wed, 14 Dec 2016 18:21:27 +0000 (13:21 -0500)]
calendarspec: free memory when parsing fails (#4890)

This prevents memory leaks on strings like `*~*-*`.

Fixes #4887

7 years agoupdate TODO
Lennart Poettering [Tue, 6 Dec 2016 18:26:48 +0000 (19:26 +0100)]
update TODO

7 years agomkosi: change /etc/issue text a bit for mkosi images build from systemd tree
Lennart Poettering [Tue, 6 Dec 2016 22:17:57 +0000 (23:17 +0100)]
mkosi: change /etc/issue text a bit for mkosi images build from systemd tree

7 years agomkosi: run tests when building mkosi images
Lennart Poettering [Tue, 6 Dec 2016 22:17:30 +0000 (23:17 +0100)]
mkosi: run tests when building mkosi images

7 years agobuild-sys: include the builddir in $PATH while testing
Lennart Poettering [Tue, 6 Dec 2016 21:55:43 +0000 (22:55 +0100)]
build-sys: include the builddir in $PATH while testing

udev-test.pl shells out systemd-detect-virt, and it really should invoke the
version from the build tree instead of one supplied by the installed system,
hence let's add the builddir to $PATH while building.

7 years agoutil-lib: rework rename_process() to be able to make use of PR_SET_MM_ARG_START
Lennart Poettering [Tue, 6 Dec 2016 19:29:07 +0000 (20:29 +0100)]
util-lib: rework rename_process() to be able to make use of PR_SET_MM_ARG_START

PR_SET_MM_ARG_START allows us to relatively cleanly implement process renaming.
However, it's only available with privileges. Hence, let's try to make use of
it, and if we can't fall back to the traditional way of overriding argv[0].

This removes size restrictions on the process name shown in argv[] at least for
privileged processes.

7 years agosysv-generator: properly translate sysv facilities
Lennart Poettering [Tue, 6 Dec 2016 18:36:30 +0000 (19:36 +0100)]
sysv-generator: properly translate sysv facilities

We used the wrong return value in one case, so that our translations were
thrown away.

While we are at it, make sure to always initialize *ret on successful function
exits.

Fixes: #4762

7 years agomachinectl: make "machinectl -E … shell" work
Lennart Poettering [Tue, 6 Dec 2016 18:35:31 +0000 (19:35 +0100)]
machinectl: make "machinectl -E … shell" work

Fixes: #4823

7 years agojournalctl: improve wording in an errors message
Lennart Poettering [Tue, 6 Dec 2016 18:34:18 +0000 (19:34 +0100)]
journalctl: improve wording in an errors message

Fixes: #4660

7 years agoman: document that "systemctl show" shows low-level properties
Lennart Poettering [Tue, 6 Dec 2016 18:33:36 +0000 (19:33 +0100)]
man: document that "systemctl show" shows low-level properties

Fixes: #4654

7 years agoman: minor fixes for sd_journal_print(3)
Lennart Poettering [Tue, 6 Dec 2016 18:27:17 +0000 (19:27 +0100)]
man: minor fixes for sd_journal_print(3)

When sd_journal_perror() was added some footers weren't updated accordingly.
Let's do so.

Fixes: #4755

7 years agomkosi: update mkosi.fedora so that we can run "make check" during build
Lennart Poettering [Tue, 6 Dec 2016 17:41:27 +0000 (18:41 +0100)]
mkosi: update mkosi.fedora so that we can run "make check" during build

Our tests require "diff" and "tree", hence let's add them to the set of
development packages.

7 years agonspawn: flush out environment block of the -a stub init process
Lennart Poettering [Tue, 6 Dec 2016 17:19:23 +0000 (18:19 +0100)]
nspawn: flush out environment block of the -a stub init process

The container detection code in virt.c we ship checks for /proc/1/environ,
looking for "container=" in it. Let's make sure our "-a" init stub exposes that
correctly.

Without this "systemd-detect-virt" run in a "-a" container won't detect that it
is being run in a container.

7 years agoutil-lib: improve container detection logic
Lennart Poettering [Tue, 6 Dec 2016 14:51:26 +0000 (15:51 +0100)]
util-lib: improve container detection logic

Previously, systemd-detect-virt was unable to detect "systemd-nspawn -a"
container environments, i.e. where PID 1 is a stub process running in host
context, as in that case /proc/1/environ was inherited from the host. Let's
improve that, and add an additional check for container environments where
/proc/1/environ is not cleaned up and does not contain the $container
environment variable:

The /proc/1/sched file shows the host PID in the first line. if this is not
1, we know we are running in a PID namespace (but not which implementation).

With these changes we should be able to detect container environments that
don't set $container at all.

7 years agoAdd sd_is_socket_sockaddr (#4885)
Zbigniew Jędrzejewski-Szmek [Wed, 14 Dec 2016 10:51:26 +0000 (05:51 -0500)]
Add sd_is_socket_sockaddr (#4885)

Fixes #1188.

7 years agoMerge pull request #4889 from evverx/fix-test-fs-util-memleak
Ronny Chevalier [Wed, 14 Dec 2016 10:34:48 +0000 (11:34 +0100)]
Merge pull request #4889 from evverx/fix-test-fs-util-memleak

test-fs-util: fix memleak

7 years agogenerator: order fsck service After= the device
Lennart Poettering [Wed, 7 Dec 2016 19:00:31 +0000 (20:00 +0100)]
generator: order fsck service After= the device

Otherwise we might get started too early.

7 years agocore: rework logic to determine when we decide to add automatic deps for mounts
Lennart Poettering [Tue, 29 Nov 2016 21:50:21 +0000 (22:50 +0100)]
core: rework logic to determine when we decide to add automatic deps for mounts

This adds a concept of "extrinsic" mounts. If mounts are extrinsic we consider
them managed by something else and do not add automatic ordering against
umount.target, local-fs.target, remote-fs.target.

Extrinsic mounts are considered:

- All mounts if we are running in --user mode

- API mounts such as everything below /proc, /sys, /dev, which exist from
  earliest boot to latest shutdown.

- All mounts marked as initrd mounts, if we run on the host

- The initrd's private directory /run/initrams that should survive until last
  reboot.

This primarily merges a couple of different exclusion lists into a single
concept.

7 years agocore: make sure targets that get a default Conflicts=shutdown.target are also ordered...
Lennart Poettering [Tue, 29 Nov 2016 20:07:05 +0000 (21:07 +0100)]
core: make sure targets that get a default Conflicts=shutdown.target are also ordered against it

Let's tweak the automatic dependency generation of target units: not only add a
Conflicts= towards shutdown.target but also an After= line for it, so that we
can be sure the new target is not started when the old target is still up.

Discovered in the context of #4733

(Also, exclude dependency generation if for shutdown.target itself. — This is
strictly speaking redundant, as unit_add_two_dependencies_by_name() detects
that and becomes a NOP, but let's make this explicit for readability.)

7 years agoAdd a bit of documentation for the various undocumented environment variables we...
Lennart Poettering [Thu, 24 Nov 2016 16:47:39 +0000 (17:47 +0100)]
Add a bit of documentation for the various undocumented environment variables we honour

7 years agoutil: Fine tune running_in_chroot() a bit
Lennart Poettering [Thu, 24 Nov 2016 16:42:19 +0000 (17:42 +0100)]
util: Fine tune running_in_chroot() a bit

Let's be a bit more careful when detecting chroot() environments, so that we
can discern them from namespaced environments.

Previously this would simply check if the root directory of PID 1 matches our
own root directory. With this commit, we also check whether the namespaces of
PID 1 and ourselves are the same. If not we assume we are running inside of a
namespaced environment instead of a chroot() environment.

This has the benefit that systemctl (which uses running_in_chroot()) will work
as usual when invoked in a namespaced service.

7 years agoMerge pull request #4806 from poettering/keyring-init
Zbigniew Jędrzejewski-Szmek [Wed, 14 Dec 2016 04:24:42 +0000 (23:24 -0500)]
Merge pull request #4806 from poettering/keyring-init

set up a per-service session kernel keyring, and store the invocation ID in it

7 years agoMerge pull request #4727 from poettering/exec-bind
Zbigniew Jędrzejewski-Szmek [Wed, 14 Dec 2016 03:30:07 +0000 (22:30 -0500)]
Merge pull request #4727 from poettering/exec-bind

More namespace improvements

7 years agotest-fs-util: fix memleak
Evgeny Vereshchagin [Wed, 14 Dec 2016 00:31:53 +0000 (00:31 +0000)]
test-fs-util: fix memleak

Fixes:
```
$ ./libtool --mode=execute valgrind --leak-check=full ./test-fs-util
...
==22871==
==22871== 27 bytes in 1 blocks are definitely lost in loss record 1 of 1
==22871==    at 0x4C2FC47: realloc (vg_replace_malloc.c:785)
==22871==    by 0x4E86D05: strextend (string-util.c:726)
==22871==    by 0x4E8F347: chase_symlinks (fs-util.c:712)
==22871==    by 0x109EBF: test_chase_symlinks (test-fs-util.c:75)
==22871==    by 0x10C381: main (test-fs-util.c:305)
==22871==
```
Closes #4888

7 years agoupdate TODO
Lennart Poettering [Thu, 24 Nov 2016 00:51:36 +0000 (01:51 +0100)]
update TODO

7 years agocore: make "Restart" service property accessible via the transient API
Lennart Poettering [Wed, 23 Nov 2016 23:44:57 +0000 (00:44 +0100)]
core: make "Restart" service property accessible via the transient API

Fixes: #4402

7 years agocore: add ability to define arbitrary bind mounts for services
Lennart Poettering [Wed, 23 Nov 2016 21:21:40 +0000 (22:21 +0100)]
core: add ability to define arbitrary bind mounts for services

This adds two new settings BindPaths= and BindReadOnlyPaths=. They allow
defining arbitrary bind mounts specific to particular services. This is
particularly useful for services with RootDirectory= set as this permits making
specific bits of the host directory available to chrooted services.

The two new settings follow the concepts nspawn already possess in --bind= and
--bind-ro=, as well as the .nspawn settings Bind= and BindReadOnly= (and these
latter options should probably be renamed to BindPaths= and BindReadOnlyPaths=
too).

Fixes: #3439

7 years agonamespace: instead of chasing mount symlinks a priori, do so as-we-go
Lennart Poettering [Tue, 13 Dec 2016 23:51:37 +0000 (00:51 +0100)]
namespace: instead of chasing mount symlinks a priori, do so as-we-go

This is relevant as many of the mounts we try to establish only can be followed
when some other prior mount that is a prefix of it is established. Hence: move
the symlink chasing into the actual mount functions, so that we do it as late
as possibly but as early as necessary.

Fixes: #4588

7 years agocore: rename BindMount structure → MountEntry
Lennart Poettering [Tue, 13 Dec 2016 23:48:52 +0000 (00:48 +0100)]
core: rename BindMount structure → MountEntry

After all, these don#t strictly encapsulate bind mounts anymore, and we are
preparing this for adding arbitrary user-defined bind mounts in a later commit,
at which point this would become really confusing. Let's clean this up, rename
the BindMount structure to MountEntry, so that it is clear that it can contain
information about any kind of mount.

7 years agonamespace: add explicit read-only flag
Lennart Poettering [Wed, 23 Nov 2016 00:09:14 +0000 (01:09 +0100)]
namespace: add explicit read-only flag

This reworks handling of the read-only management for mount points. This will
become handy as soon as we add arbitrary bind mount support (which comes in a
later commit).

7 years agonamespace: reindent protect_system_strict_table[] as well
Lennart Poettering [Tue, 22 Nov 2016 19:21:23 +0000 (20:21 +0100)]
namespace: reindent protect_system_strict_table[] as well

All other tables got reindented, but one was forgotten. Fix that.

7 years agocore: hook up MountFlags= to the transient unit logic
Lennart Poettering [Tue, 22 Nov 2016 19:19:08 +0000 (20:19 +0100)]
core: hook up MountFlags= to the transient unit logic

This makes "systemd-run -p MountFlags=shared -t /bin/sh" work, by making
MountFlags= to the list of properties that may be accessed transiently.

7 years agopam: include pam_keyinit.so in our PAM fragments
Lennart Poettering [Wed, 7 Dec 2016 19:14:43 +0000 (20:14 +0100)]
pam: include pam_keyinit.so in our PAM fragments

We want that systemd --user gets its own keyring as usual, even if the
barebones PAM snippet we ship upstream is used. If we don't do this we get the
basic keyring systemd --system sets up for us.

7 years agocore: store the invocation ID in the per-service keyring
Lennart Poettering [Fri, 2 Dec 2016 14:05:55 +0000 (15:05 +0100)]
core: store the invocation ID in the per-service keyring

Let's store the invocation ID in the per-service keyring as a root-owned key,
with strict access rights. This has the advantage over the environment-based ID
passing that it also works from SUID binaries (as they key cannot be overidden
by unprivileged code starting them), in contrast to the secure_getenv() based
mode.

The invocation ID is now passed in three different ways to a service:

- As environment variable $INVOCATION_ID. This is easy to use, but may be
  overriden by unprivileged code (which might be a bad or a good thing), which
  means it's incompatible with SUID code (see above).

- As extended attribute on the service cgroup. This cannot be overriden by
  unprivileged code, and may be queried safely from "outside" of a service.
  However, it is incompatible with containers right now, as unprivileged
  containers generally cannot set xattrs on cgroupfs.

- As "invocation_id" key in the kernel keyring. This has the benefit that the
  key cannot be changed by unprivileged service code, and thus is safe to
  access from SUID code (see above). But do note that service code can replace
  the session keyring with a fresh one that lacks the key. However in that case
  the key will not be owned by root, which is easily detectable. The keyring is
  also incompatible with containers right now, as it is not properly namespace
  aware (but this is being worked on), and thus most container managers mask
  the keyring-related system calls.

Ideally we'd only have one way to pass the invocation ID, but the different
ways all have limitations. The invocation ID hookup in journald is currently
only available on the host but not in containers, due to the mentioned
limitations.

How to verify the new invocation ID in the keyring:

 # systemd-run -t /bin/sh
 Running as unit: run-rd917366c04f847b480d486017f7239d6.service
 Press ^] three times within 1s to disconnect TTY.
 # keyctl show
 Session Keyring
  680208392 --alswrv      0     0  keyring: _ses
  250926536 ----s-rv      0     0   \_ user: invocation_id
 # keyctl request user invocation_id
 250926536
 # keyctl read 250926536
 16 bytes of data in key:
 9c96317c ac64495a a42b9cd7 4f3ff96b
 # echo $INVOCATION_ID
 9c96317cac64495aa42b9cd74f3ff96b
 # ^D

This creates a new transient service runnint a shell. Then verifies the
contents of the keyring, requests the invocation ID key, and reads its payload.
For comparison the invocation ID as passed via the environment variable is also
displayed.

7 years agocore: run each system service with a fresh session keyring
Lennart Poettering [Fri, 2 Dec 2016 00:54:41 +0000 (01:54 +0100)]
core: run each system service with a fresh session keyring

This patch ensures that each system service gets its own session kernel keyring
automatically, and implicitly. Without this a keyring is allocated for it
on-demand, but is then linked with the user's kernel keyring, which is OK
behaviour for logged in users, but not so much for system services.

With this change each service gets a session keyring that is specific to the
service and ceases to exist when the service is shut down. The session keyring
is not linked up with the user keyring and keys hence only search within the
session boundaries by default.

(This is useful in a later commit to store per-service material in the keyring,
for example the invocation ID)

(With input from David Howells)

7 years agoMerge pull request #4877 from evverx/fix-machine-id
Lennart Poettering [Tue, 13 Dec 2016 19:31:09 +0000 (20:31 +0100)]
Merge pull request #4877 from evverx/fix-machine-id

handle corrupted /etc/machine-id nicer

7 years agotest: check that we can boot with broken machine-id
Evgeny Vereshchagin [Tue, 13 Dec 2016 12:46:11 +0000 (12:46 +0000)]
test: check that we can boot with broken machine-id

7 years agosd-id128: id128_write overwrites target file
Evgeny Vereshchagin [Tue, 13 Dec 2016 11:45:01 +0000 (11:45 +0000)]
sd-id128: id128_write overwrites target file

7 years agomachine-id-setup: `--print --commit` respects the --root option
Evgeny Vereshchagin [Tue, 13 Dec 2016 11:34:09 +0000 (11:34 +0000)]
machine-id-setup: `--print --commit` respects the --root option

7 years agocore: machine_id_setup overwrites broken machine-id
Evgeny Vereshchagin [Tue, 13 Dec 2016 10:36:03 +0000 (10:36 +0000)]
core: machine_id_setup overwrites broken machine-id

7 years agonspawn: when getting SIGCHLD make sure it's from the first child (#4855)
Andrey Ulanov [Tue, 13 Dec 2016 01:38:18 +0000 (17:38 -0800)]
nspawn: when getting SIGCHLD make sure it's from the first child (#4855)

When getting SIGCHLD we should not assume that it was the first
child forked from system-nspawn that has died as it may also be coming
from an orphan process. This change adds a signal handler that ignores
SIGCHLD unless it came from the first containerized child - the real
child.

Before this change the problem can be reproduced as follows:

$ sudo systemd-nspawn --directory=/container-root --share-system
Press ^] three times within 1s to kill container.
[root@andreyu-coreos ~]# { true & } &
[1] 22201
[root@andreyu-coreos ~]#
Container root-fedora-latest terminated by signal KILL

7 years agocatalog: update french translation following 5a1d6cb (#4872)
Sylvain Plantefève [Mon, 12 Dec 2016 21:17:51 +0000 (22:17 +0100)]
catalog: update french translation following 5a1d6cb (#4872)

7 years agocatalog: update Polish translation (#4874)
Piotr Drąg [Mon, 12 Dec 2016 21:04:50 +0000 (22:04 +0100)]
catalog: update Polish translation (#4874)

7 years agoMerge pull request #4771 from keszybz/udev-property-ordering
Martin Pitt [Mon, 12 Dec 2016 15:03:52 +0000 (16:03 +0100)]
Merge pull request #4771 from keszybz/udev-property-ordering

Udev property ordering

7 years agoMerge pull request #4868 from keszybz/man
Martin Pitt [Mon, 12 Dec 2016 07:12:10 +0000 (08:12 +0100)]
Merge pull request #4868 from keszybz/man

Ellipsization

7 years agoMerge pull request #4867 from keszybz/catalog-messages
Lennart Poettering [Sun, 11 Dec 2016 23:02:01 +0000 (00:02 +0100)]
Merge pull request #4867 from keszybz/catalog-messages

Catalog message improvements

7 years agohwdb: emit warning when matches are specified at the very end of file
Zbigniew Jędrzejewski-Szmek [Thu, 1 Dec 2016 16:46:40 +0000 (11:46 -0500)]
hwdb: emit warning when matches are specified at the very end of file

This is also an error, but it wasn't caught.

[/tmp/tmp.YWeKax4fMI/etc/udev/hwdb.d/10-bad.hwdb:26] Property expected, ignoring record with no properties

7 years agoman: two trivial formatting fixes
Zbigniew Jędrzejewski-Szmek [Sun, 11 Dec 2016 22:17:17 +0000 (17:17 -0500)]
man: two trivial formatting fixes

7 years agoman: use unicode ellipsis in more places
Zbigniew Jędrzejewski-Szmek [Sun, 11 Dec 2016 22:01:07 +0000 (17:01 -0500)]
man: use unicode ellipsis in more places

As requested in
https://github.com/systemd/systemd/pull/4864#pullrequestreview-12372557.

docbook will substitute triple dots for the ellipsis in man output, so this has
no effect on the troff output, only on HTML, making it infinitesimally nicer.

In some places we show output from programs, which use dots, and those places
should not be changed. In some tables, the alignment would change if dots were
changed to the ellipsis which is only one character. Since docbook replaces the
ellipsis automatically, we should leave those be. This patch changes all other
places.

7 years agobasic/log: CODE_FUNCTION → CODE_FUNC
Zbigniew Jędrzejewski-Szmek [Sun, 11 Dec 2016 20:40:55 +0000 (15:40 -0500)]
basic/log: CODE_FUNCTION → CODE_FUNC

systemd.journal-fields(7) documents CODE_FUNC=. Internally, we were
inconsistent: sd_journal_print uses CODE_FUNC=, log.h has CODE_FUNCTION=,
python-systemd and bootchart also used CODE_FUNC=, when they were internal.
Most external projects use sd_journal_* functions, so CODE_FUNC=,
python-systemd still uses CODE_FUNC=, as does systemd-bootchart, and
independent reimplementations in golang-github-coreos-go-systemd, qtbase,
network manager, glib, pulseaudio. Hence, I don't think there's much
choice.

7 years agoshare/log: change log_syntax from "[a:b] " to "a:b: "
Zbigniew Jędrzejewski-Szmek [Sun, 11 Dec 2016 19:37:12 +0000 (14:37 -0500)]
share/log: change log_syntax from "[a:b] " to "a:b: "

Those square brackets don't fit how our other messages look like; we use colons
everywhere else. The "[a:b]" format was originally added in
ed5bcfbe3c3b68e59242c03649eea03a9707d318, and remained unchanged for 7 years,
but in the meantime other conventions evolved.

The new version is also one character shorter.

[/etc/systemd/system/systemd-networkd.service.d/override.conf:2] Failed to parse sec value, ignoring: ...
  ↓
/etc/systemd/system/systemd-networkd.service.d/override.conf:2: Failed to parse sec value, ignoring: ...

7 years agobasic/log: merge two big log_struct_internal invocations into one
Zbigniew Jędrzejewski-Szmek [Sun, 11 Dec 2016 19:34:45 +0000 (14:34 -0500)]
basic/log: merge two big log_struct_internal invocations into one

We can take advantage of the fact a NULL argument terminates the list.

7 years agotools/catalog-report.py: a script to scour the journal for bad catalog entries
Zbigniew Jędrzejewski-Szmek [Sun, 11 Dec 2016 19:25:45 +0000 (14:25 -0500)]
tools/catalog-report.py: a script to scour the journal for bad catalog entries

I think it can be a useful tool to find such issues.

SD_MESSAGE_UNIT_STARTING 7d4958e842da4a758f6c1cdc7b36dcc5: no field UNIT
../src/core/unit.c:1239 unit_status_log_starting_stopping_reloading
    Starting Paths.
    SYSLOG_FACILITY=3
    SYSLOG_IDENTIFIER=systemd
    PRIORITY=6
    USER_UNIT=paths.target

SD_MESSAGE_UNIT_STARTED 39f53479d3a045ac8e11786248231fbf: no field UNIT
../src/core/job.c:721 job_log_status_message
    Reached target Paths.
    SYSLOG_FACILITY=3
    SYSLOG_IDENTIFIER=systemd
    PRIORITY=6
    RESULT=done
    USER_UNIT=paths.target

SD_MESSAGE_STARTUP_FINISHED b07a249cd024414a82dd00cd181378ff: no field KERNEL_USEC
../src/core/manager.c:2532 manager_check_finished
    Startup finished in 19ms.
    SYSLOG_FACILITY=3
    SYSLOG_IDENTIFIER=systemd
    PRIORITY=6
    USERSPACE_USEC=19670

SD_MESSAGE_STARTUP_FINISHED b07a249cd024414a82dd00cd181378ff: no field INITRD_USEC
../src/core/manager.c:2532 manager_check_finished
    Startup finished in 19ms.
    SYSLOG_FACILITY=3
    SYSLOG_IDENTIFIER=systemd
    PRIORITY=6
    USERSPACE_USEC=19670

unknown 0ce153587afa4095832d233c17a88001: no catalog entry
gsm-manager.c:1366 start_phase
    Entering running state
    SYSLOG_IDENTIFIER=gnome-session
    PRIORITY=5

SD_MESSAGE_UNIT_STOPPING de5b426a63be47a7b6ac3eaac82e2f6f: no field UNIT
../src/core/unit.c:1239 unit_status_log_starting_stopping_reloading
    Stopping Default.
    SYSLOG_FACILITY=3
    SYSLOG_IDENTIFIER=systemd
    PRIORITY=6
    USER_UNIT=default.target

SD_MESSAGE_UNIT_STOPPED 9d1aaa27d60140bd96365438aad20286: no field UNIT
../src/core/job.c:729 job_log_status_message
    Stopped target Default.
    SYSLOG_FACILITY=3
    SYSLOG_IDENTIFIER=systemd
    PRIORITY=6
    RESULT=done
    USER_UNIT=default.target

SD_MESSAGE_TIME_CHANGE c7a787079b354eaaa9e77b371893cd27: no field REALTIME
src/core/manager.c:2049 manager_dispatch_time_change_fd
    Time has been changed
    SYSLOG_FACILITY=3
    SYSLOG_IDENTIFIER=systemd
    PRIORITY=6

unknown f3ea493c22934e26811cd62abe8e203a: no catalog entry
shell-global.c:1375 shell_global_log_structured
    GNOME Shell started at Sat Jun 11 2016 12:37:46 GMT-0400 (EDT)
    SYSLOG_IDENTIFIER=gnome-shell

SD_MESSAGE_UNIT_FAILED be02cf6855d2428ba40df7e9d022f03d: no field UNIT
src/core/job.c:803 job_log_status_message
    Failed to start GNOME Terminal Server.
    SYSLOG_FACILITY=3
    SYSLOG_IDENTIFIER=systemd
    RESULT=failed
    PRIORITY=3
    USER_UNIT=gnome-terminal-server.service

SD_MESSAGE_LID_CLOSED b72ea4a2881545a0b50e200e55b9b070: no catalog entry
src/login/logind-button.c:198 button_dispatch
    Lid closed.
    SYSLOG_FACILITY=4
    SYSLOG_IDENTIFIER=systemd-logind
    PRIORITY=6

SD_MESSAGE_LID_OPENED b72ea4a2881545a0b50e200e55b9b06f: no catalog entry
src/login/logind-button.c:219 button_dispatch
    Lid opened.
    SYSLOG_FACILITY=4
    SYSLOG_IDENTIFIER=systemd-logind
    PRIORITY=6

SD_MESSAGE_SUSPEND_KEY b72ea4a2881545a0b50e200e55b9b072: no catalog entry
src/login/logind-button.c:177 button_dispatch
    Suspend key pressed.
    SYSLOG_FACILITY=4
    SYSLOG_IDENTIFIER=systemd-logind
    PRIORITY=6

SD_MESSAGE_CONFIG_ERROR c772d24e9a884cbeb9ea12625c306c01: no catalog entry
src/shared/conf-parser.c:469 config_parse_sec
    [/etc/systemd/system/systemd-networkd.service.d/override.conf:2] Failed to parse sec value, ignoring:
    UNIT=systemd-networkd.service
    SYSLOG_FACILITY=3
    ERRNO=22
    SYSLOG_IDENTIFIER=systemd
    PRIORITY=3
    CONFIG_LINE=2
    CONFIG_FILE=/etc/systemd/system/systemd-networkd.service.d/override.conf

unknown 10dd2dc188b54a5e98970f56499d1f73: no catalog entry
gsm-manager.c:308 on_display_server_failure
    Unrecoverable failure in required component org.gnome.Shell.desktop
    PRIORITY=3
    SYSLOG_IDENTIFIER=gnome-session-binary

unknown 52fb62f99e2c49d89cfbf9d6de5e3555: no catalog entry
src/journal/test-journal-send.c:85 main
    Hello World!
    PAGE_SIZE=4096
    TERM=xterm-256color
    SYSLOG_IDENTIFIER=lt-test-journal-send
    PRIORITY=5
    N_CPUS=2
    HOME=/home/zbyszek

unknown 9348174c5cc74001a71ef26bd79d302e: no catalog entry
/usr/lib/python3.5/site-packages/dnf-plugins/system_upgrade.py:422 log_status
    Download finished.
    SYSLOG_IDENTIFIER=python3
    DNF_VERSION=1.1.10
    TARGET_RELEASEVER=25
    SYSTEM_RELEASEVER=24
    PRIORITY=5

unknown fef1cc509d5047268b83a3a553f54b43: no catalog entry
/usr/lib/python3.5/site-packages/dnf-plugins/system_upgrade.py:422 log_status
    Rebooting to perform upgrade.
    SYSLOG_IDENTIFIER=python3
    DNF_VERSION=1.1.10
    TARGET_RELEASEVER=25
    SYSTEM_RELEASEVER=24
    PRIORITY=5

unknown 3e0a5636d16b4ca4bbe5321d06c6aa62: no catalog entry
/usr/lib/python3.5/site-packages/dnf-plugins/system_upgrade.py:422 log_status
    Starting system upgrade. This will take a while.
    SYSLOG_IDENTIFIER=python3
    DNF_VERSION=1.1.10
    SYSTEM_RELEASEVER=24
    PRIORITY=5
    TARGET_RELEASEVER=25

unknown 0123456789abcdef0123456789abcdef: no catalog entry
<doctest systemd.journal.JournalHandler[9]>:1 <module>
    Message with ID
    SYSLOG_IDENTIFIER=/usr/lib/python2.7/site-packages/py/test.py
    LOGGER=custom_logger_name
    PRIORITY=4
    THREAD_NAME=MainThread

7 years agoMerge pull request #4859 from keszybz/networkd
Lennart Poettering [Sun, 11 Dec 2016 19:38:15 +0000 (20:38 +0100)]
Merge pull request #4859 from keszybz/networkd

Networkd man page update and fixes for the fallout

7 years agoMerge pull request #4864 from keszybz/build-sys
Lennart Poettering [Sun, 11 Dec 2016 19:12:32 +0000 (20:12 +0100)]
Merge pull request #4864 from keszybz/build-sys

Fix some build issues and warnings

7 years agoMerge pull request #4861 from keszybz/dissect-tweaks
Lennart Poettering [Sun, 11 Dec 2016 19:09:04 +0000 (20:09 +0100)]
Merge pull request #4861 from keszybz/dissect-tweaks

A prettification of the dissect code, mkosi and TODO updates

7 years agopid1,catalog: use a different MESSAGE_ID for user manager startup
Zbigniew Jędrzejewski-Szmek [Sun, 11 Dec 2016 16:32:28 +0000 (11:32 -0500)]
pid1,catalog: use a different MESSAGE_ID for user manager startup

This add a new message id for the end of user instance startup.
User manager startup is a different beast then the system startup.
Their descriptions are completely different too. Let's just separate
them.

Partially fixes #3351.

Also remove "successful" from the description, since we don't know if
the startup was successful or not.

7 years agobasic/extract-word,man: clarify "correction" of invalid escapes
Zbigniew Jędrzejewski-Szmek [Sun, 11 Dec 2016 04:20:42 +0000 (23:20 -0500)]
basic/extract-word,man: clarify "correction" of invalid escapes

Our warning message was misleading, because we wouldn't "correct" anything,
we'd just ignore unkown escapes. Update the message.

Also, print just the extracted word (which contains the offending sequences) in
the message, instead of the whole line.

Fixes #4697.

7 years agopid1: remove unnecessary counter
Zbigniew Jędrzejewski-Szmek [Sun, 11 Dec 2016 04:07:46 +0000 (23:07 -0500)]
pid1: remove unnecessary counter

The loop must terminate after at most three iterations anyway.

7 years agoAdded Debian config for mkosi (#4865)
AsciiWolf [Sun, 11 Dec 2016 05:14:19 +0000 (06:14 +0100)]
Added Debian config for mkosi (#4865)

7 years agoshared/firewall-util: remove warning about net/if.h workaround
Zbigniew Jędrzejewski-Szmek [Sat, 10 Dec 2016 18:55:13 +0000 (13:55 -0500)]
shared/firewall-util: remove warning about net/if.h workaround

This is already fixed upstream, so warning is not useful.
Let's keep the workaround until the fix has percolated downstream.

7 years agojournal: fix warning about LZ4_compress_limitedOutput
Zbigniew Jędrzejewski-Szmek [Sat, 10 Dec 2016 18:52:49 +0000 (13:52 -0500)]
journal: fix warning about LZ4_compress_limitedOutput

7 years agodissect: assume GPT_ROOT_SECONDARY_VERITY is defined when GPT_ROOT_SECONDARY is
Zbigniew Jędrzejewski-Szmek [Sat, 10 Dec 2016 18:35:47 +0000 (13:35 -0500)]
dissect: assume GPT_ROOT_SECONDARY_VERITY is defined when GPT_ROOT_SECONDARY is

We define those macros, and there's no reason to have one without
the other.