platform/upstream/systemd.git
6 years agocore: track why unit dependencies came to be
Lennart Poettering [Wed, 25 Oct 2017 18:46:01 +0000 (20:46 +0200)]
core: track why unit dependencies came to be

This replaces the dependencies Set* objects by Hashmap* objects, where
the key is the depending Unit, and the value is a bitmask encoding why
the specific dependency was created.

The bitmask contains a number of different, defined bits, that indicate
why dependencies exist, for example whether they are created due to
explicitly configured deps in files, by udev rules or implicitly.

Note that memory usage is not increased by this change, even though we
store more information, as we manage to encode the bit mask inside the
value pointer each Hashmap entry contains.

Why this all? When we know how a dependency came to be, we can update
dependencies correctly when a configuration source changes but others
are left unaltered. Specifically:

1. We can fix UDEV_WANTS dependency generation: so far we kept adding
   dependencies configured that way, but if a device lost such a
   dependency we couldn't them again as there was no scheme for removing
   of dependencies in place.

2. We can implement "pin-pointed" reload of unit files. If we know what
   dependencies were created as result of configuration in a unit file,
   then we know what to flush out when we want to reload it.

3. It's useful for debugging: "systemd-analyze dump" now shows
   this information, helping substantially with understanding how
   systemd's dependency tree came to be the way it came to be.

6 years agogpt-auto-generator: make sure "r" is always set
Lennart Poettering [Wed, 25 Oct 2017 18:44:25 +0000 (20:44 +0200)]
gpt-auto-generator: make sure "r" is always set

6 years agomkosi: fix build script to use right sysvinit path
Lennart Poettering [Wed, 25 Oct 2017 18:42:38 +0000 (20:42 +0200)]
mkosi: fix build script to use right sysvinit path

On Fedora /etc/init.d is a symlink to /etc/rc.d/init.d. Our build
scripts default to /etc/init.d since that is the LSB default. Let's make
sure the build script thus follows the symlink correctly and configures
to path explicitly, since otherwise our build artifacts in $DESTDIR are
incompatible with the setup we actually need for Fedora.

6 years agomkosi: configure mkosi.cache/ and mkosi.builddir/ explicitly
Lennart Poettering [Wed, 25 Oct 2017 18:40:04 +0000 (20:40 +0200)]
mkosi: configure mkosi.cache/ and mkosi.builddir/ explicitly

This way these dirs will be created automatically if they are missing,
thus always guaranteeing optimal speedy behaviour.

(Well at least, after https://github.com/systemd/mkosi/pull/181 is
merged)

6 years agocore: include a bad /var/run symlink in the "tainted" string
Lennart Poettering [Tue, 24 Oct 2017 10:26:36 +0000 (12:26 +0200)]
core: include a bad /var/run symlink in the "tainted" string

6 years agovirt: trivial whitespace fixes
Lennart Poettering [Tue, 24 Oct 2017 10:18:27 +0000 (12:18 +0200)]
virt: trivial whitespace fixes

6 years agodevice : reload when udev generates a "changed" event (#6850)
Boucman [Fri, 10 Nov 2017 16:00:32 +0000 (17:00 +0100)]
device : reload when udev generates a "changed" event (#6850)

6 years agoMerge pull request #7089 from oniko/luks2-support
Lennart Poettering [Fri, 10 Nov 2017 15:16:36 +0000 (16:16 +0100)]
Merge pull request #7089 from oniko/luks2-support

LUKS2 support for systemd-cryptsetup and dissect-image

6 years agonetworkd: set dhcp_use_routes to true when dhcp_anonymize is true (#7209)
juga0 [Fri, 10 Nov 2017 15:03:43 +0000 (15:03 +0000)]
networkd: set dhcp_use_routes to true when dhcp_anonymize is true (#7209)

It does not send duplicated options in the PRL.
Fix #7048.

6 years agocore: add missing error_message cases (#6911)
Alan Jenkins [Fri, 10 Nov 2017 14:57:52 +0000 (14:57 +0000)]
core: add missing error_message cases (#6911)

We neglected to set error_message for errors which occur _after_ the
`finish` label.  These fatal errors only happen in paths where `finish`
was reached successfully, i.e. error_message has not already been set
(and this analysis is simple enough that this need not cause too much
headaches.  Also our new assignments to error_message come immediately
after execve() calls, which would have lost the error_message if it had
been set).

Also print a status message when we fail to exec init, otherwise the only
sign the user will see is `# ` :).

This addresses the lack of error messages pointed out in issue #6827.

6 years agoMerge pull request #7096 from keszybz/logind-session-killing
Lennart Poettering [Fri, 10 Nov 2017 14:51:39 +0000 (15:51 +0100)]
Merge pull request #7096 from keszybz/logind-session-killing

Logind session killing fix

6 years agobasic/hashmap: add cleanup of memory pools (#7164)
Zbigniew Jędrzejewski-Szmek [Fri, 10 Nov 2017 14:44:58 +0000 (15:44 +0100)]
basic/hashmap: add cleanup of memory pools (#7164)

It was dropped in 89439d4fc0d29f04ac68432fd06ab84bc4e36e20. As a result, every
process that uses a hashmap allocates and then leaks the hashmap mempools.
The mempools are only allocated in the main thread, but we don't know where
the memory is used.

So let's check if we are the last thread and free the mempools then. This is
fairly heavy, because /proc/self/status has to be opened and parsed, but we do
it only when compiled for valgrind, i.e. not by default, and compared to running
under valgrind or asan, the extra cost is acceptable. The big advantage is that
we don't have to think or filter out this false positive.

As a micro-opt, cleanup is attempted only in the main thread. We could allow
any thread to check if it is the last one and perform cleanup, but that'd mean
that we'd have to _do_ the check in every thread. We don't use threads like
that, our non-main threads are always short-lived, so let's just accept the
possibility that we'll leak memory if a thread survives. The check is also
non-atomic, but it's called in a destructor of the main thread _and_ we do
cleanup only when there are no other threads, so the risk of some library
suddenly spawning another thread is very low. All in all, this is not perfect,
but should work in 999‰ of cases.

Fixes the following valgrind warning:

==22564== HEAP SUMMARY:
==22564==     in use at exit: 8,192 bytes in 2 blocks
==22564==   total heap usage: 243 allocs, 241 frees, 151,905 bytes allocated
==22564==
==22564== 4,096 bytes in 1 blocks are still reachable in loss record 1 of 2
==22564==    at 0x4C2FB6B: malloc (vg_replace_malloc.c:299)
==22564==    by 0x4F08A8C: mempool_alloc_tile (mempool.c:62)
==22564==    by 0x4F08B16: mempool_alloc0_tile (mempool.c:81)
==22564==    by 0x4EF8DE0: hashmap_base_new (hashmap.c:748)
==22564==    by 0x4EF8ED9: internal_hashmap_new (hashmap.c:782)
==22564==    by 0x11045D: test_hashmap_copy (test-hashmap-plain.c:87)
==22564==    by 0x115722: test_hashmap_funcs (test-hashmap-plain.c:914)
==22564==    by 0x10FC9D: main (test-hashmap.c:60)
==22564==
==22564== 4,096 bytes in 1 blocks are still reachable in loss record 2 of 2
==22564==    at 0x4C2FB6B: malloc (vg_replace_malloc.c:299)
==22564==    by 0x4F08A8C: mempool_alloc_tile (mempool.c:62)
==22564==    by 0x4F08B16: mempool_alloc0_tile (mempool.c:81)
==22564==    by 0x4EF8DE0: hashmap_base_new (hashmap.c:748)
==22564==    by 0x4EF8EF8: internal_ordered_hashmap_new (hashmap.c:786)
==22564==    by 0x10A2A0: test_ordered_hashmap_copy (test-hashmap-ordered.c:89)
==22564==    by 0x10F70F: test_ordered_hashmap_funcs (test-hashmap-ordered.c:916)
==22564==    by 0x10FCA2: main (test-hashmap.c:61)
==22564==
==22564== LEAK SUMMARY:
==22564==    definitely lost: 0 bytes in 0 blocks
==22564==    indirectly lost: 0 bytes in 0 blocks
==22564==      possibly lost: 0 bytes in 0 blocks
==22564==    still reachable: 8,192 bytes in 2 blocks
==22564==         suppressed: 0 bytes in 0 blocks

v2:
- check if we are the main thread

v3:
- check if there are no other threads

6 years agoFix typo in statx macro (#7180)
Antonio Rojas [Fri, 10 Nov 2017 10:07:36 +0000 (11:07 +0100)]
Fix typo in statx macro (#7180)

This makes statx properly whitelisted in supported systems.

6 years agorules: run all persistent-input rules for rmi and i8042 (#7287)
Simon Arlott [Fri, 10 Nov 2017 09:32:51 +0000 (09:32 +0000)]
rules: run all persistent-input rules for rmi and i8042 (#7287)

Commit 83b48159 set ID_BUS for these subsystems but copied the intent
of commit c49df207 by not creating symlinks for those devices.

Remove the GOTO so that the rest of the rules are still processed and
symlinks are created for rmi and i8042 devices.

6 years agosystemctl: fix memory leak (#7289)
John Lin [Fri, 10 Nov 2017 09:32:25 +0000 (17:32 +0800)]
systemctl: fix memory leak (#7289)

Fixes: #7283

6 years agosystemd-firstboot: add vconsole keymap support (#7035)
tblume [Fri, 10 Nov 2017 09:31:44 +0000 (10:31 +0100)]
systemd-firstboot: add vconsole keymap support (#7035)

Enable systemd-firstboot to set the keymap.

RFE:

https://github.com/systemd/systemd/issues/6346

6 years agocore/load-fragment: add RemoveIPC= (#7288)
Yu Watanabe [Fri, 10 Nov 2017 09:15:55 +0000 (18:15 +0900)]
core/load-fragment: add RemoveIPC= (#7288)

PR #3865 introduced RemoveIPC= but the option is not listed in
load-fragment-gperf.gperf. So, the option could be used only via d-bus.
This adds RemoveIPC= in load-fragment-gperf.gperf. Then, now we can
set the option in unit files.

Fixes #7281.

6 years agoman: remove restrictions in [Install] section (#7278)
John Lin [Thu, 9 Nov 2017 15:12:01 +0000 (23:12 +0800)]
man: remove restrictions in [Install] section (#7278)

Now [Install] section also supports drop-in files.

Follow-up for 142468d89508c63262dd59335ea6d4fe82267564.

6 years agohwdb: Add ACCEL_MOUNT_MATRIX for HP Stream 8 (#7279)
Collin Eggert [Thu, 9 Nov 2017 14:38:34 +0000 (08:38 -0600)]
hwdb: Add ACCEL_MOUNT_MATRIX for HP Stream 8 (#7279)

7 years agoMerge pull request #7280 from yuwata/fix-7270-2
Lennart Poettering [Thu, 9 Nov 2017 13:26:42 +0000 (14:26 +0100)]
Merge pull request #7280 from yuwata/fix-7270-2

test-event: do not work in assert()

7 years agocryptsetup: ignore _netdev, since it is used in generator (#7282)
Lukáš Nykrýn [Thu, 9 Nov 2017 13:24:57 +0000 (14:24 +0100)]
cryptsetup: ignore _netdev, since it is used in generator (#7282)

7 years agotest-parse-util: add more tests, mainly for empty string
Yu Watanabe [Thu, 9 Nov 2017 08:36:07 +0000 (17:36 +0900)]
test-parse-util: add more tests, mainly for empty string

7 years agolibsystemd-network: coding style fix
Yu Watanabe [Thu, 9 Nov 2017 09:39:41 +0000 (18:39 +0900)]
libsystemd-network: coding style fix

7 years agotree-wide: do not work in assert()
Yu Watanabe [Thu, 9 Nov 2017 09:38:02 +0000 (18:38 +0900)]
tree-wide: do not work in assert()

Follow-up for 85e55d14dea66f5fe412ca8128487d5ea828b7b1.

7 years agoMerge pull request #7112 from tstellar/udev-for-kfd
Lennart Poettering [Thu, 9 Nov 2017 08:22:55 +0000 (09:22 +0100)]
Merge pull request #7112 from tstellar/udev-for-kfd

udev-rules: Add rules for /dev/kfd

7 years agotest-bpf: use /bin/ping path (#7276)
Dimitri John Ledkov [Wed, 8 Nov 2017 19:04:55 +0000 (14:04 -0500)]
test-bpf: use /bin/ping path (#7276)

This path to ping is compatible with both debian-like and usr-merged
distros. This keeps the test simple, and should thus pass everywhere.

Fixes: #7267

7 years agosystemctl: respect [Install] section in drop-ins (#7158)
John Lin [Wed, 8 Nov 2017 17:04:31 +0000 (01:04 +0800)]
systemctl: respect [Install] section in drop-ins (#7158)

Fixes: #7114

7 years agoNEWS: Add note about udev changes for /dev/kvm, /dev/dri/renderD*, and /dev/kfd
Tom Stellard [Wed, 8 Nov 2017 16:35:23 +0000 (08:35 -0800)]
NEWS: Add note about udev changes for /dev/kvm, /dev/dri/renderD*, and /dev/kfd

7 years agoMerge pull request #7268 from yuwata/rfe-7262
Lennart Poettering [Wed, 8 Nov 2017 16:35:56 +0000 (17:35 +0100)]
Merge pull request #7268 from yuwata/rfe-7262

timesync: make poll interval configurable

7 years agoMerge pull request #7275 from yuwata/fix-7070-7260
Lennart Poettering [Wed, 8 Nov 2017 16:34:39 +0000 (17:34 +0100)]
Merge pull request #7275 from yuwata/fix-7070-7260

core: fixes related to RuntimeDirectory=, ReadWritePaths= and DynamicUser=

7 years agoudev-rules: Add rule for /dev/kfd
Tom Stellard [Tue, 31 Oct 2017 15:56:19 +0000 (08:56 -0700)]
udev-rules: Add rule for /dev/kfd

7 years agoudev-rules: Permission changes for /dev/dri/renderD*
Tom Stellard [Tue, 31 Oct 2017 15:46:24 +0000 (08:46 -0700)]
udev-rules: Permission changes for /dev/dri/renderD*

- Remove the uaccess tag from /dev/dri/renderD*.
- Change the owning group from video to render.
- Change default mode to 0666.
- Add an option to allow users to set the access mode for these devices at
compile time.

7 years agoudev-rules: Permission changes for /dev/kvm
Tom Stellard [Tue, 31 Oct 2017 15:41:53 +0000 (08:41 -0700)]
udev-rules: Permission changes for /dev/kvm

- Remove uaccess tag from /dev/kvm.
- Change the default mode for /dev/kvm to 0666.

7 years agoumount: always use MNT_FORCE in umount_all() (#7213)
NeilBrown [Wed, 8 Nov 2017 08:29:32 +0000 (19:29 +1100)]
umount: always use MNT_FORCE in umount_all() (#7213)

The linux umount2() systemcall accepts a MNT_FORCE flags
which some filesystems honor, particularly FUSE and various
network filesystems such as NFS.
These filesystems can sometimes wait for an indefinite period
for a response from an external service, and the wait if
sometimes "uninterruptible" meaning that the process cannot be
killed.
Using MNT_FORCE causes any such request that are outstanding to
be aborted.  This normally allows the waiting process to
be killed.  It will then realease and reference it has to the
filesytem, this allowing the filesystem to be unmounted.

If there remain active references to the filesystem, MNT_FORCE
is *not* forcefull enough to unmount the filesystem anyway.

By the time that umount_all() is run by systemd-shutdown, all
filesystems *should* be unmounted, and sync() will have been
called.  Anything that remains cannot be unmounted in a
completely clean manner and just nees to be dealt with as firmly
as possible.  So use MNT_FORCE and try to explain why in the
comment.

Also enhance an earlier comment to explain why umount2() is
safe even though mount(MNT_REMOUNT) isn't.

7 years agoman: update documents for RuntimeDirectory= and friends
Yu Watanabe [Wed, 8 Nov 2017 06:52:08 +0000 (15:52 +0900)]
man: update documents for RuntimeDirectory= and friends

7 years agocore/execute: do not create RuntimeDirectory= under private/ sub-directory
Yu Watanabe [Wed, 8 Nov 2017 06:50:58 +0000 (15:50 +0900)]
core/execute: do not create RuntimeDirectory= under private/ sub-directory

RuntimeDirectory= often used for sharing files or sockets with other
services. So, if creating them under private/ sub-directory, we cannot
set DynamicUser= to service units which want to share something through
RuntimeDirectory=.
This makes the directories given by RuntimeDirectory= are created under
/run/ even if DynamicUser= is set.

Fixes #7260.

7 years agocore/load-fragment: fix alignment
Yu Watanabe [Wed, 8 Nov 2017 05:29:47 +0000 (14:29 +0900)]
core/load-fragment: fix alignment

7 years agocore/execute: RuntimeDirectory= or friends requires mount namespace
Yu Watanabe [Wed, 8 Nov 2017 06:26:40 +0000 (15:26 +0900)]
core/execute: RuntimeDirectory= or friends requires mount namespace

Since #6940, RuntimeDirectory= or their friends imply BindPaths=.
So, if at least one of them are set, mount namespace is required.

7 years agotest: add test for ReadOnlyPaths= with RuntimeDirectory=
Yu Watanabe [Sat, 28 Oct 2017 06:35:19 +0000 (15:35 +0900)]
test: add test for ReadOnlyPaths= with RuntimeDirectory=

7 years agocore: ReadWritePaths= and friends assume '+' prefix when BindPaths= or freinds are set
Yu Watanabe [Fri, 13 Oct 2017 12:22:25 +0000 (21:22 +0900)]
core: ReadWritePaths= and friends assume '+' prefix when BindPaths= or freinds are set

When at least one of BindPaths=, BindReadOnlyPaths=, RootImage=,
RuntimeDirectory= or their friends are set, systemd prepares
a namespace under /run/systemd/unit-root. Thus, ReadWritePaths=
or their friends without '+' prefix is completely meaningless.
So, let's assume '+' prefix when one of them are set.

Fixes #7070 and #7080.

7 years agocore: remove compile_read_write_paths()
Yu Watanabe [Fri, 13 Oct 2017 12:13:25 +0000 (21:13 +0900)]
core: remove compile_read_write_paths()

From 6c47cd7d3bf35c8158a0737f34fe2c5dc95e72d6, RuntimeDirectory= and
their friends also imply BindPaths=. Thus, implying ReadWritePaths=
is meaningless.

7 years agotimesync: make poll interval configurable
Yu Watanabe [Tue, 7 Nov 2017 16:47:38 +0000 (01:47 +0900)]
timesync: make poll interval configurable

This adds PollIntervalMinSec= and PollIntervalMaxSec= to timesyncd.conf

Closes #7262.

7 years agosystemctl: remove extra space character in output (#7250)
Alan Jenkins [Tue, 7 Nov 2017 16:18:10 +0000 (16:18 +0000)]
systemctl: remove extra space character in output (#7250)

> See "systemctl  status fail-stop.service" and "journalctl  -xe" for
> details.

7 years agomkosi: set locale to be en_US.UTF-8 (#7244)
John Lin [Tue, 7 Nov 2017 16:17:40 +0000 (00:17 +0800)]
mkosi: set locale to be en_US.UTF-8 (#7244)

Fixes: #7238

7 years agocore: simplify - don't add jobs to dbus queue if we immediately remove them (#7251)
Alan Jenkins [Tue, 7 Nov 2017 16:14:15 +0000 (16:14 +0000)]
core: simplify - don't add jobs to dbus queue if we immediately remove them (#7251)

job_finish_and_invalidate() calls job_free() to destroy jobs (and remove
them from the dbus queue).  So we don't need to add them to the dbus queue
first.

We only want to add jobs to the dbus queue if they're a restart job, which
we're transmogrifying into a start job and putting back into the system.

7 years agoman: fix reference to gateway hostname (#7258)
Alessandro Ghedini [Tue, 7 Nov 2017 16:13:15 +0000 (08:13 -0800)]
man: fix reference to gateway hostname (#7258)

Follow-up to commit 1dc92a06e210a978e54c72168aaaa7487bf2fd2a which didn't
catch all cases.

7 years agocondition: detect TOMOYO MAC (#7249)
Shawn Landden [Tue, 7 Nov 2017 16:12:36 +0000 (08:12 -0800)]
condition: detect TOMOYO MAC (#7249)

TOMOYO is a Mandatory Access Control security module for Linux.
Rather than ship rules, TOMOYO features a learning mode.

http://tomoyo.osdn.jp/
http://tomoyo.osdn.jp/2.5/index.html.en

7 years agotest: switch to using ext4 instead of ext3 as default fallback fs (#7265)
Dimitri John Ledkov [Tue, 7 Nov 2017 14:51:30 +0000 (09:51 -0500)]
test: switch to using ext4 instead of ext3 as default fallback fs (#7265)

Using ext3 is not representative anymore, and Ubuntu has stopped shipping
fsck.ext3 in the initramfs.

7 years agoMerge pull request #7256 from keszybz/add-cii-badge
Lennart Poettering [Tue, 7 Nov 2017 14:47:57 +0000 (17:47 +0300)]
Merge pull request #7256 from keszybz/add-cii-badge

Add CII badge

7 years agotree-wide: do not work in assert() (#7271)
Yu Watanabe [Tue, 7 Nov 2017 13:04:20 +0000 (22:04 +0900)]
tree-wide: do not work in assert() (#7271)

Fixes #7270.

7 years agoFix Dell E7570 hwdb dimensions #7252 (#7263)
macrothian [Mon, 6 Nov 2017 22:28:06 +0000 (22:28 +0000)]
Fix Dell E7570 hwdb dimensions #7252 (#7263)

7 years agotimesync: add RootDistanceMaxSec= to timesyncd.conf (#7215)
Yu Watanabe [Sun, 5 Nov 2017 06:39:34 +0000 (15:39 +0900)]
timesync: add RootDistanceMaxSec= to timesyncd.conf (#7215)

Closes #7211.

7 years agoHACKING: add a short description of new unit tests
Zbigniew Jędrzejewski-Szmek [Sat, 4 Nov 2017 20:02:35 +0000 (21:02 +0100)]
HACKING: add a short description of new unit tests

This is all "should" and "encouraged", since we are not strict with
this, for better or worse.

7 years agoREADME.md: add CII Best Practices badge
Zbigniew Jędrzejewski-Szmek [Sat, 4 Nov 2017 19:53:25 +0000 (20:53 +0100)]
README.md: add CII Best Practices badge

7 years agoMerge pull request #7241 from keszybz/clang-warnings
Lennart Poettering [Thu, 2 Nov 2017 18:21:10 +0000 (19:21 +0100)]
Merge pull request #7241 from keszybz/clang-warnings

Fixes for various clang warnings

7 years agonetworkd: remove route - drop route type from netlink message. (#7240)
Susant Sahani [Thu, 2 Nov 2017 12:36:03 +0000 (18:06 +0530)]
networkd: remove route - drop route type from netlink message. (#7240)

During startup of networkd we try to drop the configs. While droping
routes we filling ip route type and because of which message like
```
host: Could not drop route: Invalid argument
host: Could not drop route: Invalid argument
```
are shown.

Closed #6929

7 years agoMerge pull request #7217 from sourcejedi/stopfail-stop
Zbigniew Jędrzejewski-Szmek [Thu, 2 Nov 2017 07:25:02 +0000 (08:25 +0100)]
Merge pull request #7217 from sourcejedi/stopfail-stop

2 small fixes, stopping mount and service units

7 years agotest-util: silence clang warning about unaligned access
Zbigniew Jędrzejewski-Szmek [Wed, 1 Nov 2017 22:06:27 +0000 (23:06 +0100)]
test-util: silence clang warning about unaligned access

7 years agoutil-lib: mark variable with _unused_ to silence clang warning
Zbigniew Jędrzejewski-Szmek [Wed, 1 Nov 2017 22:01:24 +0000 (23:01 +0100)]
util-lib: mark variable with _unused_ to silence clang warning

_unused_ means "the variable is meant to be possible unused and gcc
will not generate a warning about it", which is exactly what we need here,
since we're only declaring it for the side effect of _cleanup_.

7 years agojournal: disable -Waddress-of-packed-member under clang
Zbigniew Jędrzejewski-Szmek [Wed, 1 Nov 2017 21:54:39 +0000 (22:54 +0100)]
journal: disable -Waddress-of-packed-member under clang

clang warns about a few sites like this:
../src/journal/journal-file.c:1780:48: warning: taking address of packed member 'entry_offset' of class or structure 'DataObject' may result in an unaligned pointer value [-Waddress-of-packed-member]
                                              &o->data.entry_offset,
                                               ^~~~~~~~~~~~~~~~~~~~
but DataObject.entry_offset will always be 8-byte aligned as long as
the DataObject structure is aligned. Similarly in other cases, the
field is always aligned. Let's just silence the warning to avoid noise.

gcc does not know -Waddress-of-packed-member, and would warn about an unknown
warning, so we need to conditionalize on __clang__.

7 years agonetworkd: fix two format string mismatches
Zbigniew Jędrzejewski-Szmek [Wed, 1 Nov 2017 21:43:32 +0000 (22:43 +0100)]
networkd: fix two format string mismatches

../src/network/networkd-link.c:3577:84: warning: format specifies type 'unsigned char' but the argument has type 'uint32_t' (aka 'unsigned int') [-Wformat]
                                route->dst_prefixlen, route->tos, route->priority, route->table, route->lifetime);
                                                                                   ^~~~~~~~~~~~
../src/network/networkd-manager.c:1146:132: warning: format specifies type 'unsigned char' but the argument has type 'uint32_t' (aka 'unsigned int') [-Wformat]
                        rule->from_prefixlen, space ? " " : "", to_str, rule->to_prefixlen, rule->tos, rule->fwmark, rule->fwmask, rule->table);
                                                                                                                                   ^~~~~~~~~~~

Also add some line breaks to make it easier to see which argument is for which
part of the format string.

7 years agoimportd: remove IN_SET to avoid ambiguity
Zbigniew Jędrzejewski-Szmek [Wed, 1 Nov 2017 21:36:02 +0000 (22:36 +0100)]
importd: remove IN_SET to avoid ambiguity

clang warns:
../src/import/importd.c:254:70: warning: 'break' is bound to current loop, GCC binds it to the enclosing loop [-Wgcc-compat]
                while ((e < t->log_message + t->log_message_size) && IN_SET(*e, 0, '\n'))
                                                                     ^
Let's just play it safe and not use IN_SET here.

7 years agojournald: unitialized variable access
Zbigniew Jędrzejewski-Szmek [Wed, 1 Nov 2017 21:33:26 +0000 (22:33 +0100)]
journald: unitialized variable access

../src/journal/journald-native.c:341:13: warning: variable 'context' is used uninitialized whenever 'if' condition is false [-Wsometimes-uninitialized]
        if (ucred && pid_is_valid(ucred->pid)) {
            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../src/journal/journald-native.c:350:42: note: uninitialized use occurs here
                                         context, ucred, tv, label, label_len);
                                         ^~~~~~~
../src/journal/journald-native.c:335:31: note: initialize the variable 'context' to silence this warning
        ClientContext *context;
                              ^
                               = NULL

Very nice reporting!

Functions that we call can handle context == NULL, so it's enough to simply
initialize the variable.

7 years agoRemove a bunch of unused variables
Zbigniew Jędrzejewski-Szmek [Wed, 1 Nov 2017 21:32:22 +0000 (22:32 +0100)]
Remove a bunch of unused variables

gcc does not warn about those, because of the _cleanup_ usage.
clang is smarter here.

7 years agocore: failure to spawn ExecStartPost should not run ExecStop
Alan Jenkins [Mon, 14 Aug 2017 10:15:38 +0000 (11:15 +0100)]
core: failure to spawn ExecStartPost should not run ExecStop

Failure to spawn ExecStartPost was being handled differently to e.g.
EXIT_FAILURE returned by ExecStartPost.  It looks like this was an
oversight.  Fix to match documented behaviour.

`man systemd.service`:

> Note that if any of the commands specified in ExecStartPre=, ExecStart=,
> or ExecStartPost= fail (and are not prefixed with "-", see above) or time
> out before the service is fully up, execution continues with commands
> specified in ExecStopPost=, the commands in ExecStop= are skipped.

7 years agocore: distinguish "Killing"/"Terminating"/"Stopping" for mount unit timeout
Alan Jenkins [Mon, 2 Oct 2017 13:40:15 +0000 (14:40 +0100)]
core: distinguish "Killing"/"Terminating"/"Stopping" for mount unit timeout

Update the timeout warnings for remount and unmount.  For consistency with
mount, for accuracy, and for consistency with their equivalents in
service.c.

7 years agomanager: fix connecting to bus when dbus is actually around (#7205)
Michal Sekletar [Wed, 1 Nov 2017 09:25:48 +0000 (02:25 -0700)]
manager: fix connecting to bus when dbus is actually around (#7205)

manager_connect_bus() is called *before* manager_coldplug(). As a last
thing in service_coldplug() we set service state to
s->deserialized_state, and thus before we do that all services are
inactive and try_connect always evaluates to false. To fix that we must
look at deserialized state instead of current unit state.

Fixes #7146

7 years agoReverting erroneous changes made of the course of adding a timeout to journal-remote...
martingh [Wed, 1 Nov 2017 09:15:38 +0000 (10:15 +0100)]
Reverting erroneous changes made of the course of adding a timeout to journal-remote event handling (#7219)

7 years agoMerge pull request #7233 from yuwata/meson-fixes
Zbigniew Jędrzejewski-Szmek [Wed, 1 Nov 2017 09:14:01 +0000 (10:14 +0100)]
Merge pull request #7233 from yuwata/meson-fixes

Meson fixes

7 years agojournal-remote: set description to timer_event (#7234)
Yu Watanabe [Wed, 1 Nov 2017 09:13:00 +0000 (18:13 +0900)]
journal-remote: set description to timer_event (#7234)

Follow-up for 5e38eb931f9207f577e7e8b752be5a522e5f9b87.

7 years agoMerge pull request #7226 from sourcejedi/shutdown-misuse-commment
Alan Jenkins [Tue, 31 Oct 2017 10:05:02 +0000 (10:05 +0000)]
Merge pull request #7226 from sourcejedi/shutdown-misuse-commment

core: remove "misuse" of getpgid() in systemd-shutdown

7 years agomeson: do not create systemd-user-sessions.service if PAM is disabled
Yu Watanabe [Tue, 31 Oct 2017 07:20:53 +0000 (16:20 +0900)]
meson: do not create systemd-user-sessions.service if PAM is disabled

Fixes #7227.

7 years agomeson: do not include man/meson.build if xsltproc not found
Yu Watanabe [Tue, 31 Oct 2017 08:12:13 +0000 (17:12 +0900)]
meson: do not include man/meson.build if xsltproc not found

Fixes #7232.

7 years agoMerge pull request #7218 from matijaskala/patch-4
Alan Jenkins [Mon, 30 Oct 2017 17:42:33 +0000 (17:42 +0000)]
Merge pull request #7218 from matijaskala/patch-4

fix compile errors on musl

7 years agocore: remove "misuse" of getpgid() in systemd-shutdown
Alan Jenkins [Mon, 30 Oct 2017 16:10:37 +0000 (16:10 +0000)]
core: remove "misuse" of getpgid() in systemd-shutdown

Using `kill()`  with a signal of 0 is a slightly more documented idiom for
checking whether a process still exists.  It is mentioned explicitly in
man pages.  This avoids the need to comment the call as "misuse".
A comment is still necessary - in fact this idiom is even more confusing if
you don't know how it works.  But it's easy enough to explain.

7 years agoAdd sd_bus_message_new and sd_bus_message_seal as public functions (#6609)
aeywalee [Mon, 30 Oct 2017 15:08:46 +0000 (16:08 +0100)]
Add sd_bus_message_new and sd_bus_message_seal as public functions (#6609)

7 years agoMerge pull request #6996 from poettering/discover-block-device
Zbigniew Jędrzejewski-Szmek [Mon, 30 Oct 2017 15:05:20 +0000 (16:05 +0100)]
Merge pull request #6996 from poettering/discover-block-device

add nspawn image discovery on block devices

7 years agohwdb: Update GP-electronic T701 accel mount settings (#7220)
Hans de Goede [Mon, 30 Oct 2017 13:33:54 +0000 (14:33 +0100)]
hwdb: Update GP-electronic T701 accel mount settings (#7220)

The GP-electronic T701 has its LCD panel mounted upside-down, initially
my plan was to fix this by transparently rotating the image in the i915
driver (my "drm/i915: Deal with upside-down mounted LCD" patch), but
that approach has been rejected instead the kernel will now export
a "panel orientation" property on the drm-connector for the panel and
let userspace deal with it.

Since the upside-down-ness of the panel is now no longer transparently
hidden from userspace, the current accel mount quirk for the T701 needs
to be updated to take the upside-down-ness into account.

7 years agoresolved: change newline position in stub-resolv.conf (#7216)
Yu Watanabe [Mon, 30 Oct 2017 09:34:41 +0000 (18:34 +0900)]
resolved: change newline position in stub-resolv.conf (#7216)

Follow-up for e6b2d948f8f5aabf6cdede8bd39256fe83db205e.

7 years agofix includes
Matija Skala [Mon, 30 Oct 2017 09:32:45 +0000 (10:32 +0100)]
fix includes

sys/wait.h is needed for WEXITED macro

poll.h is more portable than sys/poll.h

7 years agofix compile error on musl
Matija Skala [Mon, 30 Oct 2017 09:15:31 +0000 (10:15 +0100)]
fix compile error on musl

name '__in6_u.__u6_addr32' is specific to glibc

use 's6_addr32' macro instead

7 years agoMerge pull request #7212 from whot/master
Lennart Poettering [Mon, 30 Oct 2017 09:12:12 +0000 (10:12 +0100)]
Merge pull request #7212 from whot/master

hwdb: add a hwdb for custom ID_INPUT_* overrides

7 years agorules: add Freescale IMX serial ports name to serial port udev rule (#7203)
Maciej S. Szmigiero [Mon, 30 Oct 2017 08:59:31 +0000 (09:59 +0100)]
rules: add Freescale IMX serial ports name to serial port udev rule (#7203)

Freescale IMX SoCs serial ports driven by kernel "imx-uart" driver have
names of "ttymxcN", let's add this pattern to an udev rule for serial
ports so they will have proper ownership applied.

7 years agotreewide: unify identical definitions of polkit_agent_open_if_enabled() (#7187)
Zbigniew Jędrzejewski-Szmek [Mon, 30 Oct 2017 08:57:53 +0000 (09:57 +0100)]
treewide: unify identical definitions of polkit_agent_open_if_enabled() (#7187)

Follows the same pattern as pager_open() now.

7 years agohwdb: add UC-Logic 20160N pad to the ID_INPUT hwdb
Peter Hutterer [Mon, 30 Oct 2017 00:58:00 +0000 (10:58 +1000)]
hwdb: add UC-Logic 20160N pad to the ID_INPUT hwdb

Missing the x/y axes usually exported for pad devices (for historical reaons)
and thus not recognised as tablet (pad).

Fixes #7197
See also https://bugs.freedesktop.org/show_bug.cgi?id=103395

7 years agohwdb: add a hwdb file to override ID_INPUT assignments
Peter Hutterer [Mon, 30 Oct 2017 00:42:29 +0000 (10:42 +1000)]
hwdb: add a hwdb file to override ID_INPUT assignments

The input_id builtin assigns the various ID_INPUT based on the exported evdev
bits. In some cases, the device may not have the properties required to label
a device as one specific type but the physical form factor is clear.
e.g. in the case of #7197 it's a tablet pad that does not have x/y axes which
the kernel exports for pads for historical reasons.

A custom override is needed, best to be solved with a hwdb entry.

Related #7197

7 years agoman: systemd.offline-updates: remove link to the doc it obsoletes (#7189)
Alan Jenkins [Fri, 27 Oct 2017 08:15:40 +0000 (09:15 +0100)]
man: systemd.offline-updates: remove link to the doc it obsoletes (#7189)

https://www.freedesktop.org/wiki/Software/systemd/SystemUpdates/

> This document has been replaced by systemd.offline-updates(7) man page.

It's weird to visit the first "see also", and find that it is what the manpage replaces (and looks very similar).  Surely we should remove this link.

7 years agojournalctl: add --output-fields= (#7181)
Lars Karlitski [Fri, 27 Oct 2017 03:10:47 +0000 (05:10 +0200)]
journalctl: add --output-fields= (#7181)

This option allows restricting the shown fields in the output modes that
would normally show all fields. It allows clients that are only
interested in a subset of the fields to access those more efficiently.
Also, it makes the resulting size of the output more predictable.

It has no effect on the various `short` output modes, because those
already only show a subset of the fields.

7 years agoMerge pull request #7066 from poettering/specifier-update
Yu Watanabe [Fri, 27 Oct 2017 03:09:26 +0000 (12:09 +0900)]
Merge pull request #7066 from poettering/specifier-update

extend unit file specifier expansion a bit + add a test for it

7 years agoupdate TODO
Lennart Poettering [Wed, 11 Oct 2017 12:09:10 +0000 (14:09 +0200)]
update TODO

7 years agotest: add simple test for validating some of the unit specifiers we support
Lennart Poettering [Wed, 11 Oct 2017 12:07:51 +0000 (14:07 +0200)]
test: add simple test for validating some of the unit specifiers we support

(Also, sort list of test unit files in meson.build alphabetically, to
make future additions more systematic)

7 years agocore: add support for expanding state/cache/log directory root in unit files
Lennart Poettering [Wed, 11 Oct 2017 12:02:36 +0000 (14:02 +0200)]
core: add support for expanding state/cache/log directory root in unit files

This augments %t which already resolves to the runtime directory root, and
should be useful for units that want to pass any of these paths in
command line arguments.

Example:

ExecStart=/usr/bin/mydaemon --datadir=%S/mydaemon

Why not expose a specifier resolving directly to the configured
state/runtime/cache/log dir? Three reasons:

1. Specifiers should be independent of configuration of the unit itself,
   and StateDirectory= and friends are unit configuration.  See
   03fc9c723cfc59467a7fccc305f34273f8564b25 and related work.

2. We permit multiple StateDirectory= values per unit, and it hence
   wouldn't be clear which one is passed.

3. We already have %t for the runtime directory root, and we should
   continue with the same scheme.

7 years agoupdate TODO
Lennart Poettering [Wed, 4 Oct 2017 15:44:14 +0000 (17:44 +0200)]
update TODO

7 years agomachine-image: handle nicely if the user asks us to remove a symlinked image
Lennart Poettering [Wed, 4 Oct 2017 15:42:23 +0000 (17:42 +0200)]
machine-image: handle nicely if the user asks us to remove a symlinked image

Much like for dirs/raw images lets remove the symlink and not the
destination.

7 years agodissect: when we invoke dissection on a loop device with partscan help the user
Lennart Poettering [Wed, 4 Oct 2017 15:40:46 +0000 (17:40 +0200)]
dissect: when we invoke dissection on a loop device with partscan help the user

This adds some simply detection logic for cases where dissection is
invoked on an externally created loop device, and partitions have been
detected on it, but partition scanning so far was off. If this is
detected we now print a brief message indicating what the issue is,
instead of failing with a useless EINVAL message the kernel passed to
us.

7 years agomachine-image: add partial discovery of block devices as images
Lennart Poettering [Wed, 4 Oct 2017 15:36:58 +0000 (17:36 +0200)]
machine-image: add partial discovery of block devices as images

This adds some basic discovery of block device images for nspawn and
friends. Note that this doesn't add searching for block devices using
udev, but instead expects users to symlink relevant block devices into
/var/lib/machines. Discovery is hence done exactly like for
dir/subvol/raw file images, except that what is found may be a (symlink
to) a block device.

For now, we do not support cloning these images, but removal, renaming
and read-only flags are supported to the point where that makes sense.

Fixe: #6990

7 years agofs-util: small tweak in chase_symlinks()
Lennart Poettering [Wed, 4 Oct 2017 15:34:03 +0000 (17:34 +0200)]
fs-util: small tweak in chase_symlinks()

If we follow an absolute symlink there's no need to prefix the path with
a "/", since by definition it already has one.

This helps suppressing double "/" in resolved paths containing absolute
symlinks.

7 years agobtrfs-util: when opening subvolume fds, always set O_NOFOLLOW
Lennart Poettering [Wed, 4 Oct 2017 11:48:51 +0000 (13:48 +0200)]
btrfs-util: when opening subvolume fds, always set O_NOFOLLOW

Some of the btrfs utility functions already used O_NOFOLLOW others
didn't. Let's streamline this, and refuse operation when we are called
for symlinks on "remove" and "snapshot" too.

In particular in the "remove" case following symlinks is a bad idea, and
is quite different from how unlink() and friends work, which always
remove the symlink, and not the destination, a logic we should follow
here too.

7 years agosystemd-detect-virt: refine hypervisor detection (#7171)
Razvan Cojocaru [Thu, 26 Oct 2017 14:59:04 +0000 (17:59 +0300)]
systemd-detect-virt: refine hypervisor detection (#7171)

Continue to try to get more details about the actual underlying
hypervisor with successive tests until none are available.
This fixes issue #7165.

7 years agoMerge pull request #7184 from keszybz/resolved-loop
Zbigniew Jędrzejewski-Szmek [Thu, 26 Oct 2017 13:29:03 +0000 (15:29 +0200)]
Merge pull request #7184 from keszybz/resolved-loop

resolved: fix loop on packets with pseudo dns types

https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1725351,
CVE-2017-15908.