Lennart Poettering [Wed, 20 Apr 2016 20:53:39 +0000 (22:53 +0200)]
nspawn: optionally fix up OS tree uid/gids for userns
This adds a new --private-userns-chown switch that may be used in combination
with --private-userns. If it is passed a recursive chmod() operation is run on
the OS tree, fixing all file owner UID/GIDs to the right ranges. This should
make user namespacing pretty workable, as the OS trees don't need to be
prepared manually anymore.
Lennart Poettering [Thu, 21 Apr 2016 10:47:36 +0000 (12:47 +0200)]
util: copy_file_range() returns EBADF when used on a tty
In nspawn we invoke copy_bytes() on a TTY fd. copy_file_range() returns EBADF
on a TTY and this error is considered fatal by copy_bytes() so far. Correct
that, so that nspawn's copy_bytes() operation works again.
This is a follow-up for
a44202e98b638024c45e50ad404c7069c7835c04.
Evgeny Vereshchagin [Mon, 25 Apr 2016 00:24:41 +0000 (03:24 +0300)]
tests: add test for coredump handler hanging at shutdown (#3101)
Test for #2691.
Sylvain Plantefève [Sun, 24 Apr 2016 23:56:42 +0000 (01:56 +0200)]
po: Update French translation (#3108)
Piotr Drąg [Sun, 24 Apr 2016 10:31:10 +0000 (12:31 +0200)]
catalog,po: update Polish translation (#3100)
Lennart Poettering [Sat, 23 Apr 2016 01:01:55 +0000 (03:01 +0200)]
machinectl: don't parse command line switches after "shell" verb (#3095)
Fixes: #2420
Evgeny Vereshchagin [Sat, 23 Apr 2016 00:49:47 +0000 (03:49 +0300)]
man: document the default for systemd.timer's Persistent flag (#3099)
Closes #3096
Thomas H. P. Andersen [Sat, 23 Apr 2016 00:49:07 +0000 (02:49 +0200)]
tree-wide: remove unused variables (#3098)
Zbigniew Jędrzejewski-Szmek [Fri, 22 Apr 2016 18:04:38 +0000 (14:04 -0400)]
Merge pull request #3094 from poettering/run-slice
systemd-run: fix --slice= in conjunction with --scope
Klearchos Chaloulos [Fri, 22 Apr 2016 18:04:17 +0000 (21:04 +0300)]
journal-remote : Ensure reallocation of source->buf does not result in source->size < source->filled (#3086)
While the function journal-remote-parse.c:get_line() enforces an assertion that source->filled <= source->size, in function journal-remote-parse.c:process_source() there is a chance that source->size will be decreased to a lower value than source->filled, when source->buf is reallocated. Therefore a check is added that ensures that source->buf is reallocated only when source->filled is smaller than target / 2.
Zbigniew Jędrzejewski-Szmek [Fri, 22 Apr 2016 18:03:33 +0000 (14:03 -0400)]
Merge pull request #3078 from poettering/get-processes
A variety of fixes and additions
Lennart Poettering [Fri, 22 Apr 2016 15:31:40 +0000 (17:31 +0200)]
run: make --slice= work in conjunction with --scope
Fixes: #2991
Lennart Poettering [Fri, 22 Apr 2016 15:30:08 +0000 (17:30 +0200)]
core: don't dispatch load queue when setting Slice= for transient units
Let's be more careful when setting up the Slice= property of transient units:
let's use manager_load_unit_prepare() instead of manager_load_unit(), so that
the load queue isn't dispatched right away, because our own transient unit is
in it, and we don#t want to have it loaded until we finished initializing it.
Lennart Poettering [Fri, 22 Apr 2016 15:14:30 +0000 (17:14 +0200)]
machinectl: fix misplaced newline in --help output
Lennart Poettering [Wed, 20 Apr 2016 13:27:27 +0000 (15:27 +0200)]
update TODO
Lennart Poettering [Wed, 20 Apr 2016 18:52:28 +0000 (20:52 +0200)]
man: don't claim systemd would connect stdout/stderr of daemons with /dev/null
Lennart Poettering [Wed, 20 Apr 2016 18:12:14 +0000 (20:12 +0200)]
units: order systemd-user-sessions.service after network.target
That way we can be sure that local users are logged out before the network is
shut down when the system goes down, so that SSH session should be ending
cleanly before the system goes down.
Fixes: #2390
Lennart Poettering [Wed, 20 Apr 2016 18:09:57 +0000 (20:09 +0200)]
journalctl: add --no-hostname switch
This suppresses output of the hostname for messages from the local system.
Fixes: #2342
Lennart Poettering [Wed, 20 Apr 2016 17:46:37 +0000 (19:46 +0200)]
journalctl: add output mode where time is shown in seconds since 1st Jan 1970 UTC
aka "UNIX time".
Fixes: #2120
Lennart Poettering [Wed, 20 Apr 2016 17:37:46 +0000 (19:37 +0200)]
shared: move output_mode_to_string() into output-mode.c
After all, the enum definition is in output-mode.h
Lennart Poettering [Wed, 20 Apr 2016 17:27:32 +0000 (19:27 +0200)]
coredump,basic: generalize O_TMPFILE handling a bit
This moves the O_TMPFILE handling from the coredumping code into common library
code, and generalizes it as open_tmpfile_linkable() + link_tmpfile(). The
existing open_tmpfile() function (which creates an unlinked temporary file that
cannot be linked into the fs) is renamed to open_tmpfile_unlinkable(), to make
the distinction clear. Thus, code may now choose between:
a) open_tmpfile_linkable() + link_tmpfile()
b) open_tmpfile_unlinkable()
Depending on whether they want a file that may be linked back into the fs later
on or not.
In a later commit we should probably convert fopen_temporary() to make use of
open_tmpfile_linkable().
Followup for: #3065
Lennart Poettering [Wed, 20 Apr 2016 16:28:32 +0000 (18:28 +0200)]
systemctl: add two minor assert()s
Lennart Poettering [Wed, 20 Apr 2016 16:20:51 +0000 (18:20 +0200)]
path-lookup: optimize a common strv copy operation away
Follow-up for:
https://github.com/systemd/systemd/pull/3033#discussion_r59689398
Lennart Poettering [Wed, 20 Apr 2016 16:12:57 +0000 (18:12 +0200)]
tree-wide: don't assume CLOCK_BOOTIME is generally available
Before we invoke now(CLOCK_BOOTTIME), let's make sure we actually have that
clock, since now() will otherwise hit an assert.
Specifically, let's refuse CLOCK_BOOTTIME early in sd-event if the kernel
doesn't actually support it.
This is a follow-up for #3037, and specifically:
https://github.com/systemd/systemd/pull/3037#issuecomment-
210199167
Lennart Poettering [Wed, 20 Apr 2016 15:49:31 +0000 (17:49 +0200)]
machine-id-setup: explicitly fsync() the machine ID after writing
As discussed here:
https://github.com/systemd/systemd/issues/2619#issuecomment-
184670042
Explicitly syncing /etc/machine-id after writing it, is probably a good idea,
since it has a strong "commit" character and is generally a one-time thing.
Fixes #2619.
Lennart Poettering [Wed, 20 Apr 2016 15:43:13 +0000 (17:43 +0200)]
shared: move unit-specific code from bus-util.h to bus-unit-util.h
Previously we'd have generally useful sd-bus utilities in bust-util.h,
intermixed with code that is specifically for writing clients for PID 1,
wrapping job and unit handling. Let's split the latter out and move it into
bus-unit-util.c, to make the sources a bit short and easier to grok.
Lennart Poettering [Wed, 20 Apr 2016 14:06:58 +0000 (16:06 +0200)]
shared: drop kernel_thread bool from cgroups show code
Make this an output flag instead, so that our function prototypes can lose one
parameter
Lennart Poettering [Wed, 20 Apr 2016 13:51:33 +0000 (15:51 +0200)]
loginctl,machinectl: also make use of new GetProcesses() bus call
This ports over machinectl and loginctl to also use the new GetProcesses() bus
call to show the process tree of a container or login session. This is similar
to how systemctl already has been ported over in a previous commit.
Lennart Poettering [Wed, 20 Apr 2016 13:32:24 +0000 (15:32 +0200)]
networkd: consider various IPv6 features as disabled if IPv6 is not available in the kernel
Lennart Poettering [Wed, 20 Apr 2016 13:28:28 +0000 (15:28 +0200)]
core,systemctl: add bus API to retrieve processes of a unit
This adds a new GetProcesses() bus call to the Unit object which returns an
array consisting of all PIDs, their process names, as well as their full cgroup
paths. This is then used by "systemctl status" to show the per-unit process
tree.
This has the benefit that the client-side no longer needs to access the
cgroupfs directly to show the process tree of a unit. Instead, it now uses this
new API, which means it also works if -H or -M are used correctly, as the
information from the specific host is used, and not the one from the local
system.
Fixes: #2945
Lennart Poettering [Wed, 20 Apr 2016 13:22:46 +0000 (15:22 +0200)]
shared: fix minor memory leak in log display code
frankheckenbach [Fri, 22 Apr 2016 12:21:30 +0000 (14:21 +0200)]
tmp.mount.hm4: After swap.target (#3087)
fix issue #2930
Torstein Husebø [Fri, 22 Apr 2016 12:18:05 +0000 (14:18 +0200)]
treewide: fix typos (#3092)
Lennart Poettering [Fri, 22 Apr 2016 08:56:43 +0000 (10:56 +0200)]
Merge pull request #3084 from keszybz/preset-fixes
Nicer error message is symlinking chokes on an existing file
Lennart Poettering [Fri, 22 Apr 2016 08:50:07 +0000 (10:50 +0200)]
Merge pull request #3088 from keszybz/man
One man fix and unicodification of dashes
Zbigniew Jędrzejewski-Szmek [Fri, 22 Apr 2016 02:57:06 +0000 (22:57 -0400)]
tree-wide: use mdash instead of a two minuses
Zbigniew Jędrzejewski-Szmek [Fri, 22 Apr 2016 02:52:25 +0000 (22:52 -0400)]
man: document size param of sd_journal_add_match
Fixes #1724.
Zbigniew Jędrzejewski-Szmek [Fri, 22 Apr 2016 01:11:15 +0000 (21:11 -0400)]
shared/install: always overwrite symlinks in .wants and .requires
Before:
$ systemctl preset getty@.service
Failed to preset unit, file /etc/systemd/system/getty.target.wants/getty@tty1.service
already exists and is a symlink to ../../../../usr/lib/systemd/system/getty@.service.
After:
$ systemctl preset getty@.service
Created symlink /etc/systemd/system/getty.target.wants/getty@tty1.service,
pointing to /usr/lib/systemd/system/getty@.service.
We don't really care where the symlink points to. For example, it might point
to /usr/lib or /etc, and systemd will always load the unit from /etc in
preference to /usr/lib. In fact, if we make a symlink like
/etc/systemd/system/multi-user.target.wants/b.service -> ../a.service, pid1
will still start b.service. The name of the symlink is the only thing that
matters, as far as systemd is concerned. For humans it's confusing when the
symlinks points to anything else than the actual unit file. At the very least,
the symlink is supposed to point to a file with the same name in some other
directory. Since we don't care where the symlink points, we can always replace
an existing symlink.
Another option I considered would be to simply leave an existing symlink in
place. That would work too, but replacing the symlink with the expected value
seems more intuitive.
Of course those considerations only apply to .wants and .requires. Symlinks
created with "link" and "alias" are a separate matter.
Fixes #3056.
Zbigniew Jędrzejewski-Szmek [Fri, 22 Apr 2016 00:04:21 +0000 (20:04 -0400)]
systemctl,pid1: do not warn about missing install info with "preset"
When "preset" was executed for a unit without install info, we'd warn similarly
as for "enable" and "disable". But "preset" is usually called for all units,
because the preset files are provided by the distribution, and the units are under
control of individual programs, and it's reasonable to call "preset" for all units
rather then try to do it only for the ones that can be installed.
We also don't warn about missing info for "preset-all". Thus it seems reasonable
to silently ignore units w/o install info when presetting.
(In addition, when more than one unit was specified, we'd issue the warning
only if none of them had install info. But this is probably something to fix
for enable/disable too.)
Federico [Thu, 21 Apr 2016 20:27:56 +0000 (22:27 +0200)]
hwdb: add trust illuminated mouse gxt 152 (#3085)
Zbigniew Jędrzejewski-Szmek [Thu, 21 Apr 2016 13:53:48 +0000 (09:53 -0400)]
shared/install: rewrite unit_file_changes_add()
path_kill_slashes was applied to the wrong arg...
Zbigniew Jędrzejewski-Szmek [Thu, 21 Apr 2016 13:23:18 +0000 (09:23 -0400)]
core/dbus-manager: drop unused param from installation functions
Zbigniew Jędrzejewski-Szmek [Thu, 21 Apr 2016 04:57:50 +0000 (00:57 -0400)]
shared/install: nicer error message is symlinking chokes on an existing file
Fixes #1892.
Previously:
Failed to enable unit: Invalid argument
Now:
Failed to enable unit, file /etc/systemd/system/ssh.service already exists.
It would be nice to include the unit name in the message too. I looked into
this, but it would require major surgery on the whole installation logic,
because we first create a list of things to change, and then try to apply them
in a loop. To transfer the knowledge which unit was the source of each change,
the data structures would have to be extended to carry the unit name over into
the second loop. So I'm skipping this for now.
Calvin Owens [Thu, 21 Apr 2016 17:16:28 +0000 (10:16 -0700)]
units: Add "GuessMainPID=no" to compatibility unit for rc-local (#3018)
With the current "Type=forking", systemd tries to guess the PID it
should wait on at reboot (because we have no "PIDFile="). Depending on
how wrong the guess is, we can end up hanging forever at reboot.
Asking it not to do that eliminates the problem.
Susant Sahani [Thu, 21 Apr 2016 14:08:07 +0000 (19:38 +0530)]
networkd: When link gets dirty mark manager dirty too (#3080)
If we not marking manager dirty when link is dirty then
the state file is not updated. This is a side effect of
issue 2850
setting CriticalConnection=yes
timesyncd NTP servers given by DHCP server are ignored.
Lennart Poettering [Thu, 21 Apr 2016 10:29:36 +0000 (12:29 +0200)]
Merge pull request #3005 from keszybz/kill-user-proceses
Kill user session scope by default
Martin Pitt [Thu, 21 Apr 2016 10:13:08 +0000 (12:13 +0200)]
build: fix test-nss.c build failure with --disable-{resolved,myhostname} (#3081)
When building without resolved and/or myhostname, test-nss.c failed to build
with
src/test/test-nss.c: In function 'main':
src/test/test-nss.c:417:32: error: 'MODULE1' undeclared (first use in this function)
NULSTR_FOREACH(module, MODULE1 MODULE2 MODULE3 MODULE4) {
^
Ensure that all MODULEx are always defined, and empty if the module is not
available (so that it will be a no-op in the string concatenation).
Zbigniew Jędrzejewski-Szmek [Wed, 13 Apr 2016 03:36:37 +0000 (23:36 -0400)]
shared/logs-show: fix memleak in add_matches_for_unit
Zbigniew Jędrzejewski-Szmek [Wed, 13 Apr 2016 03:35:45 +0000 (23:35 -0400)]
loginctl: show linger status in user-status
zbyszek (1002)
Since: Tue 2016-04-12 23:11:46 EDT; 23min ago
State: active
Sessions: *3
Linger: yes
Unit: user-1002.slice
├─user@1002.service
│ └─init.scope
│ ├─38 /usr/lib/systemd/systemd --user
│ └─39 (sd-pam)
└─session-3.scope
├─ 31 login -- zbyszek
├─ 44 -bash
├─15076 loginctl user-status zbyszek
└─15077 less
Zbigniew Jędrzejewski-Szmek [Wed, 13 Apr 2016 02:52:28 +0000 (22:52 -0400)]
logind: allow any user to request lingering
We enable lingering for anyone who wants this. It is still disabled by
default to avoid keeping long-running processes accidentally.
Admins might want to customize this policy on multi-user sites.
Zbigniew Jędrzejewski-Szmek [Wed, 13 Apr 2016 03:52:41 +0000 (23:52 -0400)]
logind: make KillOnlyUsers override KillUserProcesses
Instead of KillOnlyUsers being a filter for KillUserProcesses, it can now be
used to specify users to kill, independently of the KillUserProcesses
setting. Having the settings orthogonal seems to make more sense. It also
makes KillOnlyUsers symmetrical to KillExcludeUsers.
Zbigniew Jędrzejewski-Szmek [Tue, 12 Apr 2016 02:51:31 +0000 (22:51 -0400)]
build-sys: add --without-kill-user-processes configure option
Zbigniew Jędrzejewski-Szmek [Sun, 10 Apr 2016 00:40:45 +0000 (20:40 -0400)]
logind: flip KillUserProcesses to on by default
This ensures that users sessions are properly cleaned up after.
The admin can still enable or disable linger for specific users to allow
them to run processes after they log out. Doing that through the user
session is much cleaner and provides better control.
dbus daemon can now be run in the user session (with --enable-user-session,
added in 1.10.2), and most distributions opted to pick this configuration.
In the normal case it makes a lot of sense to kill remaining processes.
The exception is stuff like screen and tmux. But it's easy enough to
work around, a simple example was added to the man page in previous
commit. In the long run those services should integrate with the systemd
users session on their own.
https://bugs.freedesktop.org/show_bug.cgi?id=94508
https://github.com/systemd/systemd/issues/2900
Zbigniew Jędrzejewski-Szmek [Sat, 9 Apr 2016 20:22:08 +0000 (16:22 -0400)]
man: expand description of lingering and KillUserProcesses setting
The description in the man page was wrong, KillUserProcesses does
not kill all processes of the user. Describe what the setting
does, and also add links between the relavant sections of the
manual.
Also, add an extensive example which shows how to launch screen
in the background.
Zbigniew Jędrzejewski-Szmek [Sat, 9 Apr 2016 19:41:04 +0000 (15:41 -0400)]
man: reformat examples using <example>
Zbigniew Jędrzejewski-Szmek [Sat, 9 Apr 2016 19:03:19 +0000 (15:03 -0400)]
logind: reload config on SIGHUP
v2:
- fix setting of kill_user_processes and
*_ignore_inhibited settings
Zbigniew Jędrzejewski-Szmek [Sat, 9 Apr 2016 15:13:26 +0000 (11:13 -0400)]
core: prefix selinux messages with "selinux: "
SELinux outputs semi-random messages like "Unknown permission start for class
system", and the user has to dig into message metadata to find out where
they are comming from. Add a prefix to give a hint.
Susant Sahani [Thu, 21 Apr 2016 00:36:33 +0000 (06:06 +0530)]
networkd: respect DHCP UseRoutes option (#3075)
This fixes #2282.
Susant Sahani [Thu, 21 Apr 2016 00:34:13 +0000 (06:04 +0530)]
networkd: bump MTU to 1280 for interfaces which have IPv6 enabled (#3077)
IPv6 protocol requires a minimum MTU of 1280 bytes on the interface.
This fixes #3046.
Introduce helper link_ipv6_enabled() to figure out whether IPV6 is enabled.
Introduce network_has_static_ipv6_addresses() to find out if any static
ipv6 address configured.
If IPv6 is not configured on any interface that is SLAAC, DHCPv6 and static
IPv6 addresses not configured, then IPv6 will be automatically disabled for that
interface, that is we write "1" to /proc/sys/net/ipv6/conf//disable_ipv6.
Lennart Poettering [Wed, 20 Apr 2016 18:26:34 +0000 (20:26 +0200)]
Merge pull request #3074 from keszybz/tmpfiles
systemd-tmpfiles improvements, nspawn -E, honouring $TERM in pid1
Zbigniew Jędrzejewski-Szmek [Wed, 20 Apr 2016 04:06:25 +0000 (00:06 -0400)]
tmpfiles: add new 'e' action which cleans up a dir without creating it
I wanted to add a config line that would empty a directory
without creating it if doesn't exist. Existing actions don't allow
this.
v2: properly add 'e' to needs_glob() and takes_ownership()
Zbigniew Jędrzejewski-Szmek [Wed, 20 Apr 2016 04:03:47 +0000 (00:03 -0400)]
man: try to explain different actions in tmpfiles a bit better
- do not suggest that vendor configuration files should be in
/etc, use /usr/lib/tmpfiles.d instead
- split the first example, because the text talked about "needing
two directories", but then a smack attribute was also set, and
on a different path, which looked like a typo. Replace that
with the example from original patch [1] which added 't'.
- fix the example for /var/tmp/abrt. The 'x' line was redundant,
because /var/tmp/abrt/* is already filtered because "d /var/tmp/abrt"
overrides "d /var/tmp".
[1] http://permalink.gmane.org/gmane.comp.sysutils.systemd.devel/25051
Zbigniew Jędrzejewski-Szmek [Wed, 20 Apr 2016 02:42:00 +0000 (22:42 -0400)]
tmpfiles: shorten some long error messages
Also don't print %m when the message already contains all the info.
Zbigniew Jędrzejewski-Szmek [Wed, 20 Apr 2016 02:34:04 +0000 (22:34 -0400)]
tmpfiles: interpret "-" as stdin
Zbigniew Jędrzejewski-Szmek [Wed, 20 Apr 2016 01:56:39 +0000 (21:56 -0400)]
pid1: disable color output when TERM=dumb
This changes the behaviour of pid1 in the following ways:
- obviously $TERM is now checked,
- $SYSTEMD_COLORS is now honoured too, before only SYSTEMD_LOG_COLORS was checked,
- isatty() is run on stdout not stderr.
As requested in #3025.
Zbigniew Jędrzejewski-Szmek [Wed, 20 Apr 2016 12:41:25 +0000 (08:41 -0400)]
machinectl: add -E as alias for --setenv
Zbigniew Jędrzejewski-Szmek [Wed, 20 Apr 2016 12:38:01 +0000 (08:38 -0400)]
run: add -E as alias for --setenv
Zbigniew Jędrzejewski-Szmek [Wed, 20 Apr 2016 01:54:55 +0000 (21:54 -0400)]
nspawn: add -E as alias for --setenv
v2:
- "=" is required, so remove the <optional> tags that v1 added
Zbigniew Jędrzejewski-Szmek [Wed, 20 Apr 2016 01:30:14 +0000 (21:30 -0400)]
basic/terminal-util: cache value for colors_enabled
After all it's something that we query over and over.
For example, systemctl calls colors_enabled() four times for each failing
service. The compiler is unable to optimize those calls away because they
(potentially) accesses external and global state through on_tty() and
getenv().
Michał Bartoszkiewicz [Wed, 20 Apr 2016 08:06:26 +0000 (10:06 +0200)]
logind: use type to determine graphical sessions (#3071)
Franck Bui [Wed, 20 Apr 2016 01:18:17 +0000 (03:18 +0200)]
systemctl: hide "following" units if '--all' is not passed (#2967)
No need to dump all the redundant device units on the user, just because he
specified that he wants to see units of a specific state.
This was broken by commit
ebc962656cee33e3e8395f456a8208c3ca41969c.
Lennart Poettering [Tue, 19 Apr 2016 15:21:18 +0000 (17:21 +0200)]
Merge pull request #3055 from keszybz/preset-fixes
Another bunch of improvements to the installation code
Evgeny Vereshchagin [Tue, 19 Apr 2016 14:59:47 +0000 (17:59 +0300)]
coredump: create unnamed temporary files if possible (O_TMPFILE) (#3065)
Don't leave temporary files if the coredump service is aborted during
the operation
Yeah, these are temporary files that systemd-coredump needs while
processing the coredumps. Of course, if the coredump service is aborted
during the operation we better shouldn't leave those files around. This
is hence a bug to fix in our coredumping code.
See https://github.com/systemd/systemd/issues/2804#issuecomment-
210578147
Another option is to simply use O_TMPFILE, and when it is not available
fall back to the current behaviour. After all, the files are cleaned up
eventually, through normal tmpfiles aging, and the offending file
systems are pretty exotic these days, or not in the upstream kernel.
See https://github.com/systemd/systemd/issues/2804#issuecomment-
211496707
Zbigniew Jędrzejewski-Szmek [Mon, 18 Apr 2016 00:46:00 +0000 (20:46 -0400)]
run: change --tty option to --pty as documented
Keep the previous option name as hidden, for compatibility.
Fixes #3054.
Zbigniew Jędrzejewski-Szmek [Mon, 18 Apr 2016 00:37:30 +0000 (20:37 -0400)]
systemctl: warning about missing install info for template units
The advice string didn't talk about template units at all. Extend
it and print when trying to enable a template unit without install info.
Fixes #2345.
Zbigniew Jędrzejewski-Szmek [Tue, 19 Apr 2016 04:04:35 +0000 (00:04 -0400)]
shared/install: change value of _UNIT_FILE_CHANGE_TYPE_INVALID
-1 could be confused with -EPERM. But we still need a negative enum
value to force gcc to use int for the enum type, even though it is
unused. Otherwise we get warnings.
Zbigniew Jędrzejewski-Szmek [Sun, 17 Apr 2016 14:16:44 +0000 (10:16 -0400)]
shared/install,systemctl,core: report offending file on installation error
Fixes #2191:
$ systemctl --root=/ enable sddm
Created symlink /etc/systemd/system/display-manager.service, pointing to /usr/lib/systemd/system/sddm.service.
$ sudo build/systemctl --root=/ enable gdm
Failed to enable unit, file /etc/systemd/system/display-manager.service already exists and is a symlink to /usr/lib/systemd/system/sddm.service.
$ sudo build/systemctl --root= enable sddm
$ sudo build/systemctl --root= enable gdm
Failed to enable unit: File /etc/systemd/system/display-manager.service already exists and is a symlink to /usr/lib/systemd/system/sddm.service.
(I tried a few different approaches to pass the error information back to the
caller. Adding a new parameter to hold the error results in a gigantic patch
and a lot of hassle to pass the args arounds. Adding this information to the
changes array is straightforward and can be more easily extended in the
future.)
In case local installation is performed, the full set of errors can be reported
and we do that. When running over dbus, only the first error is reported.
Vittorio G (VittGam) [Tue, 19 Apr 2016 09:18:18 +0000 (11:18 +0200)]
sleep: Add debug feature to bypass hibernation memory checks. (#3064)
This new feature bypasses checking if a swap partition is mounted
or if there is enough swap space available for hibernation to
succeed.
This can be useful when a system with a Solid State Disk (SSD)
has no normal swap partition or file configured, and a custom
systemd unit is used to mount a swap file just before hibernating
and unmount it just after resuming.
Signed-off-by: Vittorio Gambaletta <git-systemd@vittgam.net>
Felipe Sateler [Tue, 19 Apr 2016 04:23:01 +0000 (01:23 -0300)]
zsh-completion: remove non-portable uses of \s in awk (#3063)
Zbigniew Jędrzejewski-Szmek [Sun, 17 Apr 2016 19:56:46 +0000 (15:56 -0400)]
shared/install: add helper function unit_file_changes_have_modification()
As suggested in review of #3049.
Zbigniew Jędrzejewski-Szmek [Sun, 17 Apr 2016 19:43:16 +0000 (15:43 -0400)]
Various formatting and style fixes
Felipe Sateler [Mon, 18 Apr 2016 21:27:42 +0000 (18:27 -0300)]
Add zsh completion for networkctl (#3062)
mulkieran [Mon, 18 Apr 2016 17:38:58 +0000 (13:38 -0400)]
Master minutes (#3060)
* man: change time unit specifier for minutes to "m", not "min".
To alert the reader to the fact that the ambiguous prefix "m" will be
interpreted as minutes, not months.
* man: change 'journal files' to 'archived journal files'.
So that the user may be reminded why they see log entries in the journal
from a time previous to the one they specified when using --vacuum-time.
Wouter Verhelst [Mon, 18 Apr 2016 14:29:10 +0000 (16:29 +0200)]
Mark nbd as inactive until connected (#2422)
Currently, 99-systemd.rules.in contains a line for network block
devices, which mark them as inactive until the first change event, and
as active from then on forward. This is not correct. A network block
device can be connected or disconnected; this state is signalled by the
presence or absense of a "pid" file, which contains the PID of the
nbd client userspace process that started the connection.
Update the rules file so that it checks for the presence of that file to
decide what to set SYSTEMD_READY to.
Note that current kernels do issue a change event upon connecting the
device, but not yet upon disconnecting. While it's possible to wait
until that's been fixed, the behaviour of the rule with TEST!="pid" in
the absence of a proper uevent is exactly the same as the behaviour of
the old rule; so it should be safe to apply now.
Signed-off-by: Wouter Verhelst <w@uter.be>
michaelolbrich [Mon, 18 Apr 2016 13:28:00 +0000 (15:28 +0200)]
basic: user-utils.c needs missing.h for secure_getenv (#3059)
Otherwise building may fail with:
src/basic/user-util.c: In function 'get_home_dir':
src/basic/user-util.c:343:9: error: implicit declaration of function 'secure_getenv' [-Werror=implicit-function-declaration]
Susant Sahani [Mon, 18 Apr 2016 11:45:52 +0000 (17:15 +0530)]
networkd: allow setting of multicast querier for linux bridge (#3051)
Peter Hutterer [Mon, 18 Apr 2016 06:50:25 +0000 (16:50 +1000)]
hwdb: add touchpad resolutions for the Dell XPS 15 9550 (#3057)
https://bugs.freedesktop.org/show_bug.cgi?id=94773
Dan Nicholson [Mon, 18 Apr 2016 02:52:45 +0000 (19:52 -0700)]
conf-parser: Set EXTRACT_RETAIN_ESCAPE when extracting words (#2917)
If you reference another unit with an escaped name, the escaped characters
should remain in the extracted word. This used to work correctly prior to
commit
34f253f0.
The problem can be seen when units with escaped names are referenced.
$ cat "/usr/lib/systemd/system/dev-disk-by\x2dlabel-eos\x2dswap.swap"
[Swap]
What=/dev/disk/by-label/eos-swap
[Install]
WantedBy=dev-disk-by\x2dlabel-eos\x2dswap.device
$ systemctl enable "dev-disk-by\x2dlabel-eos\x2dswap.swap"
Created symlink
/etc/systemd/system/dev-disk-byx2dlabel-eosx2dswap.device.wants/dev-disk-by\x2dlabel-eos\x2dswap.swap,
pointing to /usr/lib/systemd/system/dev-disk-by\x2dlabel-eos\x2dswap.swap.
The wants directory should be created with the x2ds escaped with \.
Lubomir Rintel [Mon, 18 Apr 2016 01:45:42 +0000 (03:45 +0200)]
tree-wide: fall back to now(CLOCK_MONOTONIC) if CLOCK_BOOTTIME unsupported (#3037)
It was added in 2.6.39, and causes an assertion to fail when running in mock
hosted on 2.6.32-based RHEL-6:
Assertion 'clock_gettime(map_clock_id(clock_id), &ts) == 0' failed at systemd/src/basic/time-util.c:70, function now(). Aborting.
Lennart Poettering [Sun, 17 Apr 2016 12:29:41 +0000 (14:29 +0200)]
Merge pull request #3049 from keszybz/preset-fixes
Fixes for preset-all handling and a few related issues
Nicolas Braud-Santoni [Sun, 17 Apr 2016 12:22:17 +0000 (14:22 +0200)]
man: systemd.exec: Clarify InaccessibleDirectories (#3048) (#3048)
Zbigniew Jędrzejewski-Szmek [Sun, 17 Apr 2016 03:08:23 +0000 (23:08 -0400)]
install: allow paths like LookupPath.generator to be NULL
Fixes #3047.
Zbigniew Jędrzejewski-Szmek [Sun, 17 Apr 2016 02:52:06 +0000 (22:52 -0400)]
tree-wide: introduce PATH_IN_SET macro
Zbigniew Jędrzejewski-Szmek [Sat, 16 Apr 2016 23:31:53 +0000 (19:31 -0400)]
systemctl/core: ignore masked units in preset-all
With any masked unit that would that would be enabled by presets, we'd get:
test@rawhide $ sudo systemctl preset-all
Failed to execute operation: Unit file is masked.
test@rawhide $ sudo systemctl --root=/ preset-all
Operation failed: Cannot send after transport endpoint shutdown
Simply ignore those units:
test@rawhide $ sudo systemctl preset-all
Unit xxx.service is masked, ignoring.
Zbigniew Jędrzejewski-Szmek [Sat, 16 Apr 2016 22:41:34 +0000 (18:41 -0400)]
tree-wide: use ERFKILL instead of ESHUTDOWN for "unit masked"
If the error code ever leaks (we print the strerror error instead of providing
our own), the message for ESHUTDOWN is "Cannot send after transport endpoint
shutdown", which can be misleading. In particular it suggest that some
mishandling of the dbus connection occured. Let's change that to ERFKILL which
has the advantage that a) it sounds implausible as actual error, b) has the
connotation of disabling something manually.
Zbigniew Jędrzejewski-Szmek [Sat, 16 Apr 2016 22:31:42 +0000 (18:31 -0400)]
journald: rewrite function with switch, fix handling of -ESHUTDOWN
The comments and the log messages are next to one another, so it's easier
to check that the messages match the comments.
The sign was omitted in the check for -ESHUTDOWN, so it was never matched.
Zbigniew Jędrzejewski-Szmek [Sat, 16 Apr 2016 22:21:58 +0000 (18:21 -0400)]
sd-bus: use IN_SET
Zbigniew Jędrzejewski-Szmek [Sat, 16 Apr 2016 21:41:46 +0000 (17:41 -0400)]
systemctl: make --root=/ disable dbus again
Before
0f03c2a4c093 specifying any path would cause the systemctl client
to do the installation itself, instead of going over dbus. Restore that
behaviour.
Harald Hoyer [Thu, 14 Apr 2016 23:14:29 +0000 (01:14 +0200)]
core/mount-setup.c: also relabel /dev/shm for selinux (#3039)
daemons, which wish to transition state from the initramfs to the real
root, might use /dev/shm for their state.
As /dev is not relabeled across mount points, /dev/shm has to be
relabled explicitly.
Daniel Mack [Thu, 14 Apr 2016 16:13:34 +0000 (18:13 +0200)]
Merge pull request #3036 from evverx/add-ldl
build-sys: add missing -ldl