platform/upstream/systemd.git
7 years agodissect: don't honour NOAUTO flags when looking for ESP (#5224)
Lennart Poettering [Wed, 8 Feb 2017 03:10:48 +0000 (04:10 +0100)]
dissect: don't honour NOAUTO flags when looking for ESP (#5224)

The flag is originally defined for "basic data partitions", but not for the
ESP. We reuse it for the various partitions defined by the Discoverable
Partitions Spec, but it isn't defined for the ESP, hence don't check for
it. Instead, do check for GPT_FLAG_NO_BLOCK_IO_PROTOCOL, as that flag
actually is defined for all partition types, and recommended to use by
the UEFI spec.

Fixes: #5218

7 years agoman: s/--unmount/--umount/g (#5243)
Lennart Poettering [Wed, 8 Feb 2017 00:54:37 +0000 (01:54 +0100)]
man: s/--unmount/--umount/g (#5243)

The --help text currently uses the "--umount" spelling, hence to the
same in the man page too.

And let's settle on "umount" instead of "unmount" here, since most folks
probably expect that when typing in a command, as util-linux' tool is
called "umount" after all, and so is the symlink "systemd-umount" we
install.

7 years agoMerge pull request #5263 from poettering/install-alias
Zbigniew Jędrzejewski-Szmek [Wed, 8 Feb 2017 00:50:20 +0000 (19:50 -0500)]
Merge pull request #5263 from poettering/install-alias

7 years agoRevert "fix handling of templates instantiated in /usr/lib (#5263)"
Zbigniew Jędrzejewski-Szmek [Wed, 8 Feb 2017 00:49:47 +0000 (19:49 -0500)]
Revert "fix handling of templates instantiated in /usr/lib  (#5263)"

This reverts commit 0698b674920aa8a56dbd6a625729a35e5ae9c5df.

It was supposed to be merged, not squashed.

7 years agofix handling of templates instantiated in /usr/lib (#5263)
Lennart Poettering [Wed, 8 Feb 2017 00:48:56 +0000 (01:48 +0100)]
fix handling of templates instantiated in /usr/lib  (#5263)

Fix handling of templates instantiated in /usr/lib.
All work to fix #5136.

7 years agoman: document *.d/ drop-in file order (#5262)
Lucas Werkmeister [Tue, 7 Feb 2017 23:58:02 +0000 (00:58 +0100)]
man: document *.d/ drop-in file order (#5262)

7 years agotmpfiles.d: set primary group rights to r-w (#5265)
lewo [Tue, 7 Feb 2017 23:56:55 +0000 (00:56 +0100)]
tmpfiles.d: set primary group rights to r-w (#5265)

If the /var/log/journal directory is created with rigths 700, the application
of an ACL rules without any primary group right sets it to 0. A chmod 755 on
this file will then only set the ACL mask and let the ACL primary group right
to 0. The directory is then unreadable for the primary group.

This patch explicitly sets the primary group to avoid this problem.

Fixes #5264.

7 years agoMerge pull request #5219 from poettering/run-size-check
Zbigniew Jędrzejewski-Szmek [Tue, 7 Feb 2017 23:37:04 +0000 (18:37 -0500)]
Merge pull request #5219 from poettering/run-size-check

before reloading, check that /run/systemd has enough space

7 years agoMerge pull request #5259 from lucaswerkmeister/man
Lennart Poettering [Tue, 7 Feb 2017 19:24:43 +0000 (20:24 +0100)]
Merge pull request #5259 from lucaswerkmeister/man

Manpage improvements

7 years agoMerge pull request #5261 from AsciiWolf/master
Lennart Poettering [Tue, 7 Feb 2017 19:24:05 +0000 (20:24 +0100)]
Merge pull request #5261 from AsciiWolf/master

l10n: various fixes

7 years agoinstall: remove some unused parameters from various functions in install.c
Lennart Poettering [Tue, 7 Feb 2017 19:22:09 +0000 (20:22 +0100)]
install: remove some unused parameters from various functions in install.c

No need to pass what we don't use.

7 years agoinstall: when a template unit is instantiated via a /usr symlink, consider it enabled
Lennart Poettering [Tue, 7 Feb 2017 19:16:12 +0000 (20:16 +0100)]
install: when a template unit is instantiated via a /usr symlink, consider it enabled

If a unit foobar@.service stored below /usr is instantiated via a
symlink foobar@quux.service also below /usr, then we should consider the
instance statically enabled, while the template itself should continue
to be considered enabled/disabled/static depending on its [Install]
section.

In order to implement this we'll now look for enablement symlinks in all
unit search paths, not just in the config and runtime dirs.

Fixes: #5136

7 years agol10n: fix file permissions of Indonesian translation
AsciiWolf [Tue, 7 Feb 2017 18:02:01 +0000 (19:02 +0100)]
l10n: fix file permissions of Indonesian translation

7 years agol10n: fix strings formatting in Czech translation
AsciiWolf [Tue, 7 Feb 2017 18:00:24 +0000 (19:00 +0100)]
l10n: fix strings formatting in Czech translation

7 years agoman: document that systemd-run --on-* cannot be used with --pty
Lucas Werkmeister [Tue, 7 Feb 2017 15:25:17 +0000 (16:25 +0100)]
man: document that systemd-run --on-* cannot be used with --pty

7 years agoinstall: don't enter loop when traversing a template symlinks
Lennart Poettering [Tue, 7 Feb 2017 15:22:49 +0000 (16:22 +0100)]
install: don't enter loop when traversing a template symlinks

Before this patch, if we'd encounter an instance or template symlink
while traversing a chain of symlinks we'd fill in the instance name and
retry the iteration. This makes no sense if the resulting name is
actually the same as we are coming from, as we'd just spin a couple of
times in the loop, until the UNIT_FILE_FOLLOW_SYMLINK_MAX iteration
limit is hit.

Fix this, by accepted the symlink as it is, if it identical to what we
filled in.

7 years agoman: use systemctl enable --now
Lucas Werkmeister [Thu, 26 Jan 2017 10:03:09 +0000 (11:03 +0100)]
man: use systemctl enable --now

7 years agoman: add cross-reference
Lucas Werkmeister [Thu, 26 Jan 2017 10:01:28 +0000 (11:01 +0100)]
man: add cross-reference

The third paragraph of the Description already linked to
systemd.resource-control(5), but it was missing from the list of
additional options for the [Service] section.

7 years agoMerge pull request #5225 from poettering/seccomp-socket
Evgeny Vereshchagin [Tue, 7 Feb 2017 02:06:54 +0000 (05:06 +0300)]
Merge pull request #5225 from poettering/seccomp-socket

make RestrictAddressFamilies= officially a NOP on i386

7 years agoMerge pull request #5239 from poettering/notify-access-all
Evgeny Vereshchagin [Mon, 6 Feb 2017 20:59:33 +0000 (23:59 +0300)]
Merge pull request #5239 from poettering/notify-access-all

man: document that sd_notify() is racy in some cases

7 years agoupdate TODO
Lennart Poettering [Mon, 6 Feb 2017 20:14:31 +0000 (21:14 +0100)]
update TODO

7 years agoREADME: suffix unit file options with "="
Lennart Poettering [Mon, 6 Feb 2017 20:13:21 +0000 (21:13 +0100)]
README: suffix unit file options with "="

7 years agoupdate TODO
Lennart Poettering [Mon, 6 Feb 2017 19:26:33 +0000 (20:26 +0100)]
update TODO

7 years agonotify: document that we fake the PID when sending sd_notify()
Lennart Poettering [Mon, 6 Feb 2017 19:01:24 +0000 (20:01 +0100)]
notify: document that we fake the PID when sending sd_notify()

7 years agoupdate TODO
Lennart Poettering [Mon, 6 Feb 2017 17:37:28 +0000 (18:37 +0100)]
update TODO

7 years agoman: document that sd_notify() is racy in some cases
Lennart Poettering [Mon, 6 Feb 2017 12:49:44 +0000 (13:49 +0100)]
man: document that sd_notify() is racy in some cases

7 years agocore: use a memfd for serialization
Lennart Poettering [Fri, 3 Feb 2017 15:30:00 +0000 (16:30 +0100)]
core: use a memfd for serialization

If we can, use a memfd for serializing state during a daemon reload or
reexec. Fall back to a file in /run/systemd or /tmp only if memfds are
not available.

See: #5016

7 years agomanager: refuse reloading/reexecing when /run is overly full
Lennart Poettering [Fri, 3 Feb 2017 11:12:54 +0000 (12:12 +0100)]
manager: refuse reloading/reexecing when /run is overly full

Let's add an extra safety check: before entering a reload/reexec, let's
verify that there's enough room in /run for it.

Fixes: #5016

7 years agosystemd-mount: add missing fsck argument (#5238)
Lukas Rusak [Mon, 6 Feb 2017 13:25:15 +0000 (05:25 -0800)]
systemd-mount: add missing fsck argument (#5238)

7 years agoman: Document that RestrictAddressFamilies= doesn't work on s390/s390x/...
Lennart Poettering [Fri, 3 Feb 2017 17:33:04 +0000 (18:33 +0100)]
man: Document that RestrictAddressFamilies= doesn't work on s390/s390x/...

We already say that it doesn't work on i386, but there are more archs
like that apparently.

7 years agoseccomp: RestrictAddressFamilies= is not supported on i386/s390/s390x, make it a NOP
Lennart Poettering [Fri, 3 Feb 2017 17:31:05 +0000 (18:31 +0100)]
seccomp: RestrictAddressFamilies= is not supported on i386/s390/s390x, make it a NOP

See: #5215

7 years agoupdate TODO
Lennart Poettering [Mon, 6 Feb 2017 12:49:40 +0000 (13:49 +0100)]
update TODO

7 years agoMerge pull request #5237 from keszybz/explicit-bzero
Lennart Poettering [Mon, 6 Feb 2017 12:35:56 +0000 (13:35 +0100)]
Merge pull request #5237 from keszybz/explicit-bzero

Use `explicit_bzero`

7 years agocgls: look at the right variable in error path (#5234)
Zbigniew Jędrzejewski-Szmek [Mon, 6 Feb 2017 12:34:01 +0000 (07:34 -0500)]
cgls: look at the right variable in error path (#5234)

CID #1370779.

7 years agojournalctl: replace string_erase with memset('x')
Zbigniew Jędrzejewski-Szmek [Mon, 6 Feb 2017 01:09:41 +0000 (20:09 -0500)]
journalctl: replace string_erase with memset('x')

The compiler should not be able to optimize out the memset, because optarg is global
memory. In this case, not making the argument an empty string is nicer, so just use
an open-coded version of string_erase from before the explicit_bzero change.

7 years agotreewide: replace homegrown memory_erase with explicit_bzero
Zbigniew Jędrzejewski-Szmek [Mon, 6 Feb 2017 01:05:27 +0000 (20:05 -0500)]
treewide: replace homegrown memory_erase with explicit_bzero

explicit_bzero was added in glibc 2.25. Make use of it.

explicit_bzero is hardcoded to zero the memory, so string erase now
truncates the string, instead of overwriting it with 'x'. This causes
a visible difference only in the journalctl case.

7 years agoresolved: downgrade "processing query..." message to debug (#5233)
Felipe Sateler [Sun, 5 Feb 2017 22:17:50 +0000 (19:17 -0300)]
resolved: downgrade "processing query..." message to debug (#5233)

It doesn't really add much value in normal operation and just spams the log.

7 years agoMerge pull request #5223 from keszybz/root-workdir
Martin Pitt [Sun, 5 Feb 2017 21:31:02 +0000 (22:31 +0100)]
Merge pull request #5223 from keszybz/root-workdir

Fix WorkDir=~ with empty User=

7 years agobuild-sys,man: describe systemd-umount and hook it up to installation (#5227)
Zbigniew Jędrzejewski-Szmek [Sun, 5 Feb 2017 21:27:38 +0000 (16:27 -0500)]
build-sys,man: describe systemd-umount and hook it up to installation (#5227)

7 years agoseccomp: don't ever try to add an ABI before removing the default native ABI (#5230)
Evgeny Vereshchagin [Sun, 5 Feb 2017 16:58:19 +0000 (19:58 +0300)]
seccomp: don't ever try to add an ABI before removing the default native ABI (#5230)

https://github.com/systemd/systemd/issues/5215#issuecomment-277156262

libseccomp does not allow you to add architectures to a filter that
doesn't match the byte ordering of the architectures already added to
the filter (it would be a mess, not to mention largely pointless) and
since systemd attempts to add an ABI before removing the default native
ABI, you will always fail on Power (either due to ppc or ppc64le). The
fix is to remove the native ABI before adding a new ABI so you don't run
into problems with byte ordering.

You would likely see the same failure on a MIPS system.

Thanks @pcmoore!

7 years agocatalog: update Russian translation (#5232)
Sergey Ptashnick [Sun, 5 Feb 2017 16:56:47 +0000 (20:56 +0400)]
catalog: update Russian translation (#5232)

7 years agocore/timer: downgrade message about random time addition (#5229)
Zbigniew Jędrzejewski-Szmek [Sun, 5 Feb 2017 08:37:46 +0000 (03:37 -0500)]
core/timer: downgrade message about random time addition (#5229)

This seems like something that shouldn't be higher then debug level, even
if it does not get emitted too often.

Fixes #5228.

7 years agoSilence two "unused function af_lookup" warnings (#5222)
Zbigniew Jędrzejewski-Szmek [Sat, 4 Feb 2017 15:25:20 +0000 (10:25 -0500)]
Silence two "unused function af_lookup" warnings (#5222)

Gcc7 is smarter about detecting unused functions and detects those two functions
which are unused in tests. But gperf generates them for us, so let's instead of removing
tell gcc that we know they might be unused in the test code.

In file included from ../src/test/test-af-list.c:29:0:
./src/basic/af-from-name.h:140:1: warning: ‘lookup_af’ defined but not used [-Wunused-function]
 lookup_af (register const char *str, register size_t len)
 ^~~~~~~~~
In file included from ../src/test/test-arphrd-list.c:29:0:
./src/basic/arphrd-from-name.h:125:1: warning: ‘lookup_arphrd’ defined but not used [-Wunused-function]
 lookup_arphrd (register const char *str, register size_t len)
 ^~~~~~~~~~~~~

7 years agosystemd-mount features and improvements (#5067)
Lukas Rusak [Sat, 4 Feb 2017 15:21:49 +0000 (07:21 -0800)]
systemd-mount features and improvements (#5067)

systemd-mount --unmount /some/path
systemd-mount --umount /some/path
systemd-mount -u /some/path
systemd-unmount /some/path
all do the same thing that one could expect from the name.

7 years agoMerge pull request #4973 from poettering/run-race
Martin Pitt [Fri, 3 Feb 2017 17:44:42 +0000 (18:44 +0100)]
Merge pull request #4973 from poettering/run-race

run: fix race for "systemd-run --wait"

7 years agoman: clarify interface for suspend/resume integration (#5220)
Martin Pitt [Fri, 3 Feb 2017 17:11:37 +0000 (18:11 +0100)]
man: clarify interface for suspend/resume integration (#5220)

Fixes #4916.

7 years agocore/execute: pass the username to utmp/wtmp database
Zbigniew Jędrzejewski-Szmek [Fri, 3 Feb 2017 16:32:42 +0000 (11:32 -0500)]
core/execute: pass the username to utmp/wtmp database

Before previous commit, username would be NULL for root, and set only
for other users. So the argument passed to utmp_put_init_process()
would be "root" for other users and NULL for root. Seems strange.
Instead, always pass the username if available.

7 years agocore/execute: set HOME, USER also for root users
Zbigniew Jędrzejewski-Szmek [Fri, 3 Feb 2017 14:41:53 +0000 (09:41 -0500)]
core/execute: set HOME, USER also for root users

This changes the environment for services running as root from:

LANG=C.utf8
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin
INVOCATION_ID=ffbdec203c69499a9b83199333e31555
JOURNAL_STREAM=8:1614518

to

LANG=C.utf8
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin
HOME=/root
LOGNAME=root
USER=root
SHELL=/bin/sh
INVOCATION_ID=15a077963d7b4ca0b82c91dc6519f87c
JOURNAL_STREAM=8:1616718

Making the environment special for the root user complicates things
unnecessarily. This change simplifies both our logic (by making the setting
of the variables unconditional), and should also simplify the logic in
services (particularly scripts).

Fixes #5124.

7 years agotime-util: Fix overflow check introduce in commit f977849 (#5216)
Benjamin Robin [Fri, 3 Feb 2017 15:13:55 +0000 (16:13 +0100)]
time-util: Fix overflow check introduce in commit f977849 (#5216)

7 years agorun: exit early in --pty if service failed
Lennart Poettering [Fri, 23 Dec 2016 23:35:58 +0000 (00:35 +0100)]
run: exit early in --pty if service failed

This reworks systemd-run so that in --pty mode we watch the unit state
the way we do it in --wait mode. Whenever we notice that the service is
in failed or inactive state finish right-away, but first write all
unwritten characters we can read from the master TTY device.

This makes sure that when the TTY service fails before it opens the
slave PTY device we properly notice that and exit early, so that borked
start parameters result in immediate systemd-run failure. Previously,
we'd not notice this at all, as a PTY slave that never was opened won't
result in POLLHUP events, and we'd hence simply keep reading from it
forever.

In essence, --pty now enables the same unit watching logic that --wait
enables. However, unless --wait is specified we won#t show the final
summary, hence the effective difference should be pretty minimal.

Fixes: #3915

7 years agorun: explicitly close pty forwarder before printing summary
Lennart Poettering [Fri, 23 Dec 2016 23:34:34 +0000 (00:34 +0100)]
run: explicitly close pty forwarder before printing summary

If the PTY forwarder is still around our TTY will have borked settings,
regarding newlines, hence explicitly close it before showing the
summary, so that it looks pretty.

7 years agorun: complain when --pty is used together with --no-block, which makes no sense
Lennart Poettering [Fri, 23 Dec 2016 23:30:49 +0000 (00:30 +0100)]
run: complain when --pty is used together with --no-block, which makes no sense

7 years agosd-event: when an event source fails, don't assume the type of it is still set
Lennart Poettering [Fri, 23 Dec 2016 22:26:15 +0000 (23:26 +0100)]
sd-event: when an event source fails, don't assume the type of it is still set

If a callback of an event source returns an error, then the event source
might already be half-destroyed, if the callback dropped all refs.
Hence, don't assume that the type is still valid, and save it before we
issue the callback.

7 years agoMerge pull request #5213 from keszybz/systemctl-root-cat
Lennart Poettering [Fri, 3 Feb 2017 10:02:28 +0000 (11:02 +0100)]
Merge pull request #5213 from keszybz/systemctl-root-cat

Two fixes to path lookup when --root is used

7 years agorules: allow systemd to manage UBI volumes (#5214)
Mirza Krak [Fri, 3 Feb 2017 08:26:50 +0000 (09:26 +0100)]
rules: allow systemd to manage UBI volumes (#5214)

UBI is a software layer on top of MTD devices that is used with flash
chips.

7 years agologind: Don't try to emit a change signal for the 'Sessions' property (#5211)
afrantzis [Fri, 3 Feb 2017 01:39:26 +0000 (03:39 +0200)]
logind: Don't try to emit a change signal for the 'Sessions' property (#5211)

The 'Sessions' property for both org.freedesktop.login1.User and
org.freedesktop.login1.Seat is marked as EmitsChangedSignal(false).
Trying to emit a change signal that includes the 'Sessions' property
leads to the signal not being sent at all.

Fixes #5210.

7 years agoMerge pull request #5212 from poettering/time-range
Zbigniew Jędrzejewski-Szmek [Fri, 3 Feb 2017 01:36:18 +0000 (20:36 -0500)]
Merge pull request #5212 from poettering/time-range

time handling fixes

7 years agoptyfwd: set event source description strings for all event sources of a ptyfwd object
Lennart Poettering [Fri, 23 Dec 2016 22:25:49 +0000 (23:25 +0100)]
ptyfwd: set event source description strings for all event sources of a ptyfwd object

7 years agorun: fix race for "systemd-run --wait"
Lennart Poettering [Fri, 23 Dec 2016 21:56:39 +0000 (22:56 +0100)]
run: fix race for "systemd-run --wait"

D-Bus is inherently racy when a function returns an object path for a
newly allocated object the client shall watch: as the object already
exists before the client can subscribe to it, it might lose messages
from it.

Let's fix this, by explicitly querying unit properties right after
subscribing to its property changes.

Fixes: #4920

7 years agocgls: --machine= expects an argument, indicate that in log messages
Lennart Poettering [Thu, 2 Feb 2017 17:36:15 +0000 (18:36 +0100)]
cgls: --machine= expects an argument, indicate that in log messages

We gnerally suffix file settings and cmdline options that expect ags
with "=" to indicate that. Do so here, too.

7 years agotime-util: add overflow checking to monotonic timestamp specifications
Lennart Poettering [Thu, 2 Feb 2017 17:35:00 +0000 (18:35 +0100)]
time-util: add overflow checking to monotonic timestamp specifications

7 years agotime-util: when formatting usec_t as raw integers use PRIu64
Lennart Poettering [Thu, 2 Feb 2017 17:34:26 +0000 (18:34 +0100)]
time-util: when formatting usec_t as raw integers use PRIu64

After all, usec_t is defined as uint64_t, and not as unsigned long long.

7 years agotime-util: when converting to time_t do something useful in 2038
Lennart Poettering [Thu, 2 Feb 2017 17:33:36 +0000 (18:33 +0100)]
time-util: when converting to time_t do something useful in 2038

On systems where time_t is 32bit we should invalidate the
timeval/timespec instead of proceeding with a potentially overflown
value.

7 years agotime-util: refuse formatting/parsing times that we can't store
Lennart Poettering [Thu, 2 Feb 2017 17:30:29 +0000 (18:30 +0100)]
time-util: refuse formatting/parsing times that we can't store

usec_t is always 64bit, which means it can cover quite a number of
years. However, 4 digit year display and glibc limitations around time_t
limit what we can actually parse and format. Let's make this explicit,
so that we never end up formatting dates we can#t parse and vice versa.

Note that this is really just about formatting/parsing. Internal
calculations with times outside of the formattable range are not
affected.

7 years agotime: time_t is signed, and mktime() is happy to return negative time
Lennart Poettering [Thu, 2 Feb 2017 17:25:33 +0000 (18:25 +0100)]
time: time_t is signed, and mktime() is happy to return negative time

Passing a year such as 1960 to mktime() will result in a negative return
value. This is quite confusing, as the man page claims that on failure
the call will return -1...

Given that our own usec_t type is unsigned, and we can't express times
before 1970 hence, let's consider all negative times returned by
mktime() as invalid, regardless if just -1, or anything else negative.

7 years agonspawn: shown exec() command is misleading
Lennart Poettering [Thu, 2 Feb 2017 17:27:25 +0000 (18:27 +0100)]
nspawn: shown exec() command is misleading

There's no point in updating exec_target for each binary we try to
execute, if we override it right-away anyway... Let's just do this once,
and include all binaries we try each time.

Follow-up for 1a68e1e543fd8f899503bec00585a16ada296ef7.

7 years agosystemctl: 'show' don't exit with a failure status if the requested property does...
Franck Bui [Thu, 2 Feb 2017 18:29:44 +0000 (19:29 +0100)]
systemctl: 'show' don't exit with a failure status if the requested property does not exist (#5201)

"systemctl show -pUnknown <service>" used to exit with '0' even if the property
passed by '-p' doesn't exist. But since commit 3dced37b7c2c9a5c733817 (v231+),
it exits with a failure status.

"systemctl show" is supposed to be scriptable and therefore its behavior is
supposed to be stable.

This patch restores the old behavior on which a couple of scripts already rely
now.

Also when the requested property doesn't exist, it always logs it at the debug
level since this part of the code is only used by the show command.

Fixes: #5118

7 years agosystemctl: also use chase_symlinks for dropins
Zbigniew Jędrzejewski-Szmek [Thu, 2 Feb 2017 17:17:20 +0000 (12:17 -0500)]
systemctl: also use chase_symlinks for dropins

The general rule is:
- code in shared/ should take an "original_root" argument (possibly NULL)
  and pass it along down to chase_symlinks
- code in core/ should always use specify original_root==NULL, since we
  don't support running the manager from non-root directory
- code in systemctl and other tools should pass arg_root.

For any code that is called from tools which support --root, chase_symlinks
must be used to look up paths.

7 years agosystemctl: do not prepend arg_root twice when catting units
Zbigniew Jędrzejewski-Szmek [Thu, 2 Feb 2017 16:32:40 +0000 (11:32 -0500)]
systemctl: do not prepend arg_root twice when catting units

The paths in lookup_paths already contain the arg_root prefix.

Fixes #5190.

7 years agocore/mount: remove repeated word
Zbigniew Jędrzejewski-Szmek [Thu, 2 Feb 2017 16:18:34 +0000 (11:18 -0500)]
core/mount: remove repeated word

7 years agoMerge pull request #5204 from keszybz/masked-warning-cleanup
Lennart Poettering [Thu, 2 Feb 2017 10:47:30 +0000 (11:47 +0100)]
Merge pull request #5204 from keszybz/masked-warning-cleanup

Cleanup of error code mismatch for masked units

7 years agoMerge pull request #5202 from keszybz/cgls-units
Lennart Poettering [Thu, 2 Feb 2017 10:45:51 +0000 (11:45 +0100)]
Merge pull request #5202 from keszybz/cgls-units

systemd-cgls --unit --user-unit

7 years agoMerge pull request #5203 from poettering/dotdot
Zbigniew Jędrzejewski-Szmek [Thu, 2 Feb 2017 03:43:28 +0000 (22:43 -0500)]
Merge pull request #5203 from poettering/dotdot

trivial unification of checking for "." and ".." when iterating through directories...

7 years agocgls: allow --unit, --user-unit to take optional argument
Zbigniew Jędrzejewski-Szmek [Thu, 2 Feb 2017 03:24:41 +0000 (22:24 -0500)]
cgls: allow --unit, --user-unit to take optional argument

The following are all equivalent:
--unit foo.service bar.service
--unit=foo.service bar.service
--unit=foo.service --unit=bar.service
foo.service bar.service --unit

Similarly for --user-unit.

The only case that doesn't work well is when --unit and --user-unit are mixed:
  --unit=foo.service --user-unit=bar.service
We'll treat both names as user units. I think this is OK.

7 years agocgls: add --user-unit to show user units
Zbigniew Jędrzejewski-Szmek [Wed, 1 Feb 2017 20:20:46 +0000 (15:20 -0500)]
cgls: add --user-unit to show user units

7 years agocgls: add --unit to show units
Zbigniew Jędrzejewski-Szmek [Wed, 1 Feb 2017 19:52:46 +0000 (14:52 -0500)]
cgls: add --unit to show units

$ systemd-cgls -u systemd-journald.service machine.slice

I opted for a "global" switch, instead of modifying the behaviour of just one
argument. It seem to be a more useful setting, since usually one will want to
query one or more units, and not mix unit names with paths.

Closes #5156.

7 years agoshared/cgroup-show: extract funtion to query unit cgroup path
Zbigniew Jędrzejewski-Szmek [Wed, 1 Feb 2017 19:30:57 +0000 (14:30 -0500)]
shared/cgroup-show: extract funtion to query unit cgroup path

…and use it where possible.

7 years agocgtop: use common function to query cgroup root
Zbigniew Jędrzejewski-Szmek [Thu, 2 Feb 2017 01:26:58 +0000 (20:26 -0500)]
cgtop: use common function to query cgroup root

show_cgroup_get_root_and_warn is renamed to show_cgroup_get_path_and_warn
because it now optionally allows querying a non-root path.

This removes duplicated code and teaches cgtop to combine
-M with a root prefix:

$ systemd-cgtop -M myprecious /system.slice
...

7 years agocgls: make function to query cgroup root public
Zbigniew Jędrzejewski-Szmek [Wed, 1 Feb 2017 18:25:27 +0000 (13:25 -0500)]
cgls: make function to query cgroup root public

No functional change.

7 years agocore/transaction: also downgrade warning for masked units wanted by followed units
Zbigniew Jędrzejewski-Szmek [Thu, 2 Feb 2017 00:48:27 +0000 (19:48 -0500)]
core/transaction: also downgrade warning for masked units wanted by followed units

The warning "Cannot add dependency job, ignoring" was downgraded to info in one
place, but not in the other.

C.f. #5179.

7 years agoConsistently use ERFKILL for masked units
Zbigniew Jędrzejewski-Szmek [Wed, 1 Feb 2017 23:36:09 +0000 (18:36 -0500)]
Consistently use ERFKILL for masked units

76ec966f0e33685f833 changed the code from ESHUTDOWN to ERFKILL, but missed one
spot in bus-common-errors.c. Fix that.

The code in transaction.c was checking for ERFKILL, but I'm not sure if this
mismatch had any effect, i.e. if there were any code paths in which the wrong
code actually made difference.

Also add comments when ESHUTDOWN is used in the journal code, so it's easy to
distinguish those cases when grepping. Standarize on the same capitalization.

(There's also a bunch of uses in sd-bus.c, but that's clearly different.)

7 years agoMerge pull request #5151 from keszybz/journal-flags
Lennart Poettering [Thu, 2 Feb 2017 00:01:45 +0000 (01:01 +0100)]
Merge pull request #5151 from keszybz/journal-flags

More information about unsupported journal file flags

7 years agoman: fix spelling error parth -> path
Brandon Philips [Wed, 1 Feb 2017 23:54:42 +0000 (00:54 +0100)]
man: fix spelling error parth -> path

7 years agosystemctl: restore --failed (#5198)
Zbigniew Jędrzejewski-Szmek [Wed, 1 Feb 2017 23:23:46 +0000 (18:23 -0500)]
systemctl: restore --failed (#5198)

'systemctl --failed' is an extremely common operation and it's nice to have
a shortcut for it.

Revert "man: don't document systemctl --failed" and add the option back to
systemctl's help and shell completion scripts.

This reverts commit 036359ba8d0aba7db7eac75d10073a849a033fd1.

7 years agohexdecoct: use typesafe new() instead of malloc()
Lennart Poettering [Wed, 1 Feb 2017 23:10:44 +0000 (00:10 +0100)]
hexdecoct: use typesafe new() instead of malloc()

7 years agofs-util: unify code we use to check if dirent's d_name is "." or ".."
Lennart Poettering [Wed, 1 Feb 2017 23:06:18 +0000 (00:06 +0100)]
fs-util: unify code we use to check if dirent's d_name is "." or ".."

We use different idioms at different places. Let's replace this is the
one true new idiom, that is even a bit faster...

7 years agosystem-update-generator: warn if the command line blocks updates (#5173)
Zbigniew Jędrzejewski-Szmek [Wed, 1 Feb 2017 20:50:03 +0000 (15:50 -0500)]
system-update-generator: warn if the command line blocks updates (#5173)

If "3", "5", "systemd.unit=", or similar are present on the kernel command line,
the system will not enter into offline update. This behaviour is in line with the
general logic that configuration on the kernel command line has higher priority
than the configuration on disk, but is rather surprising. Emit a warning to help
users diagnose the situation.

https://bugzilla.redhat.com/show_bug.cgi?id=1405439#c4

7 years agoupdate TODO
Lennart Poettering [Wed, 1 Feb 2017 19:02:17 +0000 (20:02 +0100)]
update TODO

7 years agoMerge pull request #5191 from keszybz/tweaks
Zbigniew Jędrzejewski-Szmek [Wed, 1 Feb 2017 15:27:32 +0000 (10:27 -0500)]
Merge pull request #5191 from keszybz/tweaks

7 years agoRevert "Trivial typo fixes and code refactorings (#5191)"
Zbigniew Jędrzejewski-Szmek [Wed, 1 Feb 2017 15:26:50 +0000 (10:26 -0500)]
Revert "Trivial typo fixes and code refactorings (#5191)"

Let's do a merge to preserve all the commit messages.

This reverts commit 785d345145bbd06c8f1c75c6a0b119c4e8f411db.

7 years agoTrivial typo fixes and code refactorings (#5191)
Zbigniew Jędrzejewski-Szmek [Wed, 1 Feb 2017 14:04:27 +0000 (09:04 -0500)]
Trivial typo fixes and code refactorings (#5191)

* logind: trivial simplification

free_and_strdup() handles NULL arg, so make use of that.

* boot: fix two typos

* pid1: rewrite check in ignore_proc() to not check condition twice

It's harmless, but it seems nicer to evaluate a condition just a single time.

* core/execute: reformat exec_context_named_iofds() for legibility

* core/execute.c: check asprintf return value in the usual fashion

This is unlikely to fail, but we cannot rely on asprintf return value
on failure, so let's just be correct here.

CID #1368227.

* core/timer: use (void)

CID #1368234.

* journal-file: check asprintf return value in the usual fashion

This is unlikely to fail, but we cannot rely on asprintf return value
on failure, so let's just be correct here.

CID #1368236.

* shared/cgroup-show: use (void)

CID #1368243.

* cryptsetup: do not return uninitialized value on error

CID #1368416.

7 years agonspawn: Print attempted execv() path on failure (#5199)
Philip Withnall [Wed, 1 Feb 2017 13:36:16 +0000 (13:36 +0000)]
nspawn: Print attempted execv() path on failure (#5199)

The failure message is typically currently:
   execv() failed: No such file or directory
which is not very useful because it doesn’t tell you which file or
directory it was trying to exec.

7 years agoMerge pull request #5166 from keszybz/gcc7
Evgeny Vereshchagin [Wed, 1 Feb 2017 09:02:50 +0000 (12:02 +0300)]
Merge pull request #5166 from keszybz/gcc7

Fixes for gcc 7 and new µhttpd & glibc warnings

7 years agoMerge pull request #5146 from ssahani/ifname-alias
Zbigniew Jędrzejewski-Szmek [Wed, 1 Feb 2017 01:36:20 +0000 (20:36 -0500)]
Merge pull request #5146 from ssahani/ifname-alias

networkd: Allow ':' in label

This reverts a341dfe563 and takes a slightly different approach: anything is
allowed in network interface labels, but network interface names are verified
as before (i.e. amongst other things, no colons are allowed there).

7 years agonss-util: silence warning about deprecated RES_USE_INET6
Zbigniew Jędrzejewski-Szmek [Wed, 1 Feb 2017 00:55:33 +0000 (19:55 -0500)]
nss-util: silence warning about deprecated RES_USE_INET6

src/nss-resolve/nss-resolve.c: In function ‘_nss_resolve_gethostbyname_r’:
src/nss-resolve/nss-resolve.c:680:13: warning: RES_USE_INET6 is deprecated
 NSS_GETHOSTBYNAME_FALLBACKS(resolve);
             ^~~~~~~~~~~~~~~~~~~~~~~~~

In glibc bz #19582, RES_USE_INET6 was deprecated. This might make sense for
clients, but they didn't take into account nss module implementations which
*must* continue to support the option. glibc internally defines
DEPRECATED_RES_USE_INET6 which can be used without emitting a warning, but
it's not exported publicly. Let's do the same, and just copy the definition
to our header.

7 years agoMurmurHash: all /* fall through */ comments
Zbigniew Jędrzejewski-Szmek [Wed, 1 Feb 2017 00:35:04 +0000 (19:35 -0500)]
MurmurHash: all /* fall through */ comments

7 years agocryptsetup: do not return uninitialized value on error
Zbigniew Jędrzejewski-Szmek [Tue, 31 Jan 2017 19:01:53 +0000 (14:01 -0500)]
cryptsetup: do not return uninitialized value on error

CID #1368416.

7 years agojournal/lookup3: silence gcc 7 implicit-fallthrough warning
Zbigniew Jędrzejewski-Szmek [Fri, 27 Jan 2017 06:08:08 +0000 (01:08 -0500)]
journal/lookup3: silence gcc 7 implicit-fallthrough warning

This file doesn't include any of our headers, so just use the pragma
without defining it in macros.h

7 years agotree-wide: adjust fall through comments so that gcc is happy
Zbigniew Jędrzejewski-Szmek [Fri, 27 Jan 2017 05:50:10 +0000 (00:50 -0500)]
tree-wide: adjust fall through comments so that gcc is happy

gcc 7 adds -Wimplicit-fallthrough=3 to -Wextra. There are a few ways
we could deal with that. After we take into account the need to stay compatible
with older versions of the compiler (and other compilers), I don't think adding
__attribute__((fallthrough)), even as a macro, is worth the trouble. It sticks
out too much, a comment is just as good. But gcc has some very specific
requiremnts how the comment should look. Adjust it the specific form that it
likes. I don't think the extra stuff we had in those comments was adding much
value.

(Note: the documentation seems to be wrong, and seems to describe a different
pattern from the one that is actually used. I guess either the docs or the code
will have to change before gcc 7 is finalized.)

7 years agonspawn: fix clobbering of selinux context arg
Zbigniew Jędrzejewski-Szmek [Fri, 27 Jan 2017 05:45:38 +0000 (00:45 -0500)]
nspawn: fix clobbering of selinux context arg

First bug fixed by gcc 7. Yikes.