Zbigniew Jędrzejewski-Szmek [Fri, 23 Nov 2018 08:16:11 +0000 (09:16 +0100)]
libudev: drop unnecessary check
sd_device_get_subsystem returns -ENOENT if subsystem is not set.
Zbigniew Jędrzejewski-Szmek [Fri, 23 Nov 2018 08:12:56 +0000 (09:12 +0100)]
Merge pull request #10861 from yuwata/udev-list-cleanups
libudev: several cleanups for udev-list
Zbigniew Jędrzejewski-Szmek [Fri, 23 Nov 2018 07:53:33 +0000 (08:53 +0100)]
Merge pull request #10886 from yuwata/sd-device-monitor-fix-filter
sd-device: fix subsystem filter
Lennart Poettering [Wed, 21 Nov 2018 15:43:40 +0000 (16:43 +0100)]
unit: minor optimization, use stack over heap, when we can
Daniel van Vugt [Thu, 22 Nov 2018 06:06:46 +0000 (14:06 +0800)]
70-mouse.hwdb: Set DPI for MS Classic IntelliMouse
It defaults to 3200 DPI and 1000 Hz. Note the ?? is required to
match the multibyte UTF-8 character '®'.
Lennart Poettering [Thu, 22 Nov 2018 23:46:02 +0000 (00:46 +0100)]
Merge pull request #10891 from yuwata/use-main-macro-2
tree-wide: use recently introduced macros
Lennart Poettering [Wed, 21 Nov 2018 16:06:19 +0000 (17:06 +0100)]
unit: drop an unused fields from Unit struct
Yu Watanabe [Thu, 22 Nov 2018 17:47:51 +0000 (02:47 +0900)]
test: add more tests for subsystem filter
Lennart Poettering [Thu, 22 Nov 2018 21:25:27 +0000 (22:25 +0100)]
core: add two minor comments (#10890)
Yu Watanabe [Thu, 22 Nov 2018 21:15:33 +0000 (06:15 +0900)]
locale: define main through macro
Yu Watanabe [Thu, 22 Nov 2018 21:12:55 +0000 (06:12 +0900)]
locale: store polkit_registry in Context
Yu Watanabe [Thu, 22 Nov 2018 21:12:45 +0000 (06:12 +0900)]
locale: rename context_free() to context_clear()
Yu Watanabe [Thu, 22 Nov 2018 21:00:02 +0000 (06:00 +0900)]
resolvectl: use static destructor and define main through macro
Yu Watanabe [Thu, 22 Nov 2018 20:55:10 +0000 (05:55 +0900)]
rfkill: define main through macro
Yu Watanabe [Thu, 22 Nov 2018 20:54:44 +0000 (05:54 +0900)]
rfkill: store write queue and rfkill fd in struct Context
Yu Watanabe [Thu, 22 Nov 2018 20:11:31 +0000 (05:11 +0900)]
socket-proxy: define main through macro
Yu Watanabe [Thu, 22 Nov 2018 20:04:32 +0000 (05:04 +0900)]
sysusers: use ordered_hashmap_steal_first_key_and_value()
Yu Watanabe [Thu, 22 Nov 2018 19:55:17 +0000 (04:55 +0900)]
time-wait: define main through macro
Yu Watanabe [Thu, 22 Nov 2018 19:47:12 +0000 (04:47 +0900)]
timedate: define main through macro
Yu Watanabe [Thu, 22 Nov 2018 19:40:22 +0000 (04:40 +0900)]
update-done: quit earlier on failure
Yu Watanabe [Thu, 22 Nov 2018 19:38:06 +0000 (04:38 +0900)]
update-utmp: use _cleanup_ attribute to finalize process
Yu Watanabe [Thu, 22 Nov 2018 19:27:09 +0000 (04:27 +0900)]
veritysetup-generator: use static destructors and define main through macro
Yu Watanabe [Thu, 22 Nov 2018 19:23:27 +0000 (04:23 +0900)]
veritysetup-generator: make arg_dest const
Yu Watanabe [Thu, 22 Nov 2018 19:21:08 +0000 (04:21 +0900)]
veritysetup: use static destructors and define main through macro
This also changes the return value when crypt_init_by_name() fails in 'detach'.
Evgeny Vereshchagin [Thu, 22 Nov 2018 16:09:20 +0000 (17:09 +0100)]
tests: add a fuzzer for catalog_import_file
Zbigniew Jędrzejewski-Szmek [Thu, 22 Nov 2018 16:05:33 +0000 (17:05 +0100)]
man: update description of Description=
The way this is used drifted a bit from the original intent. Let's update
the description and add some examples to inspire people to texts that look
less bad during initial boot.
Zbigniew Jędrzejewski-Szmek [Thu, 22 Nov 2018 19:47:33 +0000 (20:47 +0100)]
Merge pull request #10884 from yuwata/udev-debug
meson: add more debug options
Yu Watanabe [Thu, 22 Nov 2018 16:24:34 +0000 (01:24 +0900)]
sd-device-monitor: fix subsystem filter
This fixes a bug introduced by
759d9f3f8d07af2940bb3783acc3985ee47adfa5.
Fixes #10882.
Yu Watanabe [Thu, 22 Nov 2018 16:02:10 +0000 (01:02 +0900)]
udev-rules: update log messages
Yu Watanabe [Thu, 22 Nov 2018 15:36:35 +0000 (00:36 +0900)]
meson: also add option for debugging siphash
Yu Watanabe [Thu, 22 Nov 2018 15:28:27 +0000 (00:28 +0900)]
meson: add option for debugging udev
Yu Watanabe [Thu, 22 Nov 2018 15:22:09 +0000 (00:22 +0900)]
udev-rules: trivial coding style cleanups
Yu Watanabe [Thu, 22 Nov 2018 15:07:32 +0000 (00:07 +0900)]
udev: rename udev_rules_unref() to udev_rules_free()
As udev_rules do not have a reference counter.
Yu Watanabe [Thu, 22 Nov 2018 14:46:43 +0000 (23:46 +0900)]
libudev: do not ignore error in udev_list_entry_add()
Yu Watanabe [Wed, 21 Nov 2018 05:06:41 +0000 (14:06 +0900)]
libudev: introduce return_with_errno() and use it where applicable
Yu Watanabe [Wed, 21 Nov 2018 04:43:55 +0000 (13:43 +0900)]
test: add tests for libudev-list
Yu Watanabe [Wed, 21 Nov 2018 04:09:59 +0000 (13:09 +0900)]
libudev-list: drop unused udev argument from udev_list_init()
Yu Watanabe [Wed, 21 Nov 2018 04:06:17 +0000 (13:06 +0900)]
libudev-list: drop unused private functions
Yu Watanabe [Thu, 22 Nov 2018 14:16:43 +0000 (23:16 +0900)]
Merge pull request #10871 from keszybz/more-cleanup-2
Allow "synthetic" errno to be used in log calls
Lennart Poettering [Tue, 20 Nov 2018 23:07:43 +0000 (00:07 +0100)]
sysctl: when debug logging about sysctl changes, truncate trailing newline
Zbigniew Jędrzejewski-Szmek [Thu, 22 Nov 2018 09:56:43 +0000 (10:56 +0100)]
basic/log: add note about operator precendence
Zbigniew Jędrzejewski-Szmek [Thu, 22 Nov 2018 09:39:31 +0000 (10:39 +0100)]
CODING_STYLE: describe log & return operations
Zbigniew Jędrzejewski-Szmek [Wed, 21 Nov 2018 23:51:29 +0000 (00:51 +0100)]
Also drop a few more unnecessary uses of synthethic errno
Zbigniew Jędrzejewski-Szmek [Wed, 21 Nov 2018 07:23:20 +0000 (08:23 +0100)]
coccinelle: also mark previous synthetic errnos as such
Zbigniew Jędrzejewski-Szmek [Tue, 20 Nov 2018 22:40:44 +0000 (23:40 +0100)]
coccinelle: make use of SYNTHETIC_ERRNO
Ideally, coccinelle would strip unnecessary braces too. But I do not see any
option in coccinelle for this, so instead, I edited the patch text using
search&replace to remove the braces. Unfortunately this is not fully automatic,
in particular it didn't deal well with if-else-if-else blocks and ifdefs, so
there is an increased likelikehood be some bugs in such spots.
I also removed part of the patch that coccinelle generated for udev, where we
returns -1 for failure. This should be fixed independently.
Zbigniew Jędrzejewski-Szmek [Tue, 20 Nov 2018 22:03:40 +0000 (23:03 +0100)]
basic/log: add concept of "synthethic errnos"
Synthetic errnos are processed like normal, and may be used in %m and become
the return value from log_*(), but they are not logged in the journal.
Tim Ruffing [Wed, 21 Nov 2018 20:41:15 +0000 (21:41 +0100)]
vconsole: Don't skip udev call for dummy device
Kernel 4.19 supports deferred console takeover [0], i.e., fbcon will
take over the console only when the first text is displayed on the
console. Before that event, only the dummy console is active. Our
currently udev rules call systemd-vconsole on every vtcon except for
dummy consoles. Thus the exception for dummy consoles prevents a call
to systemd-vconsole when no text is displayed on the console, and as a
consequence, the keymap will not be set in that case. This is wrong and
leads to issues when keyboard input is expected without text on the
console, e.g., when a graphical password prompt is used in the boot
process.
This reverts commit
6b169c13ecf645a0a341f49b9dc2afb312a74206,
which introduced the exception for dummy devices to save unnecessary
udev calls.
Fixes #10826.
[0] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=
83d83bebf40132e2d55ec58af666713cc76f9764
Yann E. MORIN [Wed, 21 Nov 2018 17:09:04 +0000 (18:09 +0100)]
basic/user-util: properly protect use of gshadow
Commit
100d5f6ee6 (user-util: add new wrappers for [...] database
files), ammended by commit
4f07ffa8f5 (Use #if instead of #ifdef for
ENABLE_GSHADOW) moved code from sysuser to basic/user-util.
In doing so, the combination of both commits properly propagated the
ENABLE_GSHADOW conditions around the function manipulating gshadow, but
they forgot to protect the inclusion of the gshadow.h header.
Fix that to be able to build on C libraries that do not provide gshadow
(e.g. uClibc-ng, where it does not exist.)
Lennart Poettering [Wed, 21 Nov 2018 16:28:23 +0000 (17:28 +0100)]
Merge pull request #9961 from fbuihuu/logind-fix-vt-reinit-race
Logind fix vt reinit race
Zbigniew Jędrzejewski-Szmek [Wed, 21 Nov 2018 09:21:28 +0000 (10:21 +0100)]
Revert
5fdf2d51c244288ac41443d1bd81365fab7b7b81
This reverts
5fdf2d51c244288ac41443d1bd81365fab7b7b81, except for one improved
log message.
Fixes #10613.
Checking if resume= is configured is a good idea, but it turns out we cannot do
it reliably:
- the code only supported boot options with sd-boot, and it's not very widely
used. This means that for most systemd we could only check the current
commandline, not the next one.
- Various systems resume without, e.g. Debian has
/etc/initramfs-tools/conf.d/resume in the initramfs.
Making those checks better would be possible with enough effort, but there'll
be always new systems that boot in a slightly different way and we would need
to keep adding new cases. Longer term, we want to rely on autodetecting the
resume partition, and then checks like this will not be necessary at all. It is
quite clear from the number of bug reports that the number of poeple impacted
by this is quite high now, so let's just drop this.
Franck Bui [Mon, 27 Aug 2018 21:16:10 +0000 (23:16 +0200)]
logind: stop managing VT switches if no sessions are registered on that VT
When no sessions are registered on a given VT (anymore), we should always let
the kernel processes VT switching (instead of simply emitting a warning)
otherwise the requests sent by the kernel are simply ignored making the VT
switch requested by users simply impossible.
Even if it shouldn't happen, this case was encountered in issue #9754, so
better to be safe than sorry.
Franck Bui [Mon, 27 Aug 2018 20:42:00 +0000 (22:42 +0200)]
terminal-util: introduce vt_release() helper
Franck Bui [Mon, 27 Aug 2018 20:13:21 +0000 (22:13 +0200)]
logind: become the controlling terminal process before restoring VT
Basically when a session ends, logind notices and restores VT_AUTO so the
kernel takes back VT-switching over.
logind achieves that by watching the process that took control of the session
(via the "TakeControl" D-Bus method), aka "the watched process", which can
be different from the one that initially opened the VT aka "the terminal
controlling process".
In this case the terminal controlling process can exit after the watched one
did and while logind is restoring the VT.
Even if logind took care to re-open the VT in case the VT was already in HUP
state, it wasn't enough because the terminal controlling process could have
exited right after, leaving the VT in HUP state and in VT_PROCESS mode making
further VT-switching impossible.
This patch fixes this situation by forcing logind to become the terminal
controlling process.
Fixes: #9754.
Franck Bui [Mon, 27 Aug 2018 20:33:44 +0000 (22:33 +0200)]
terminal-util: introduce vt_restore() helper
Franck Bui [Thu, 23 Aug 2018 16:03:04 +0000 (18:03 +0200)]
logind: make session_restore_vt() static
It's only used in logind-session.c.
Zbigniew Jędrzejewski-Szmek [Wed, 21 Nov 2018 09:12:00 +0000 (10:12 +0100)]
generators: drop umask calls
systemd already sets the umask (see
e3b8d0637dd755b3426f3363b2cdad63f738116c). When
running under systemd, we don't need to set it. And when *not* running under
systemd, for example during development, there is no reason to override the user
config. Let's just drop those calls.
$ git grep -e 'umask\(' -l 'src/*generator*' |xargs perl -i -0pe 's|^[^\n]*umask\([^\n]+\n\n||gms'
Michal Koutný [Fri, 2 Nov 2018 19:56:08 +0000 (20:56 +0100)]
core: Detect initial timer state from serialized data
We keep a mark whether a single-shot timer was triggered in the caller's
variable initial. When such a timer elapses while we are
serializing/deserializing the inner state, we consider the timer
incorrectly as elapsed and don't trigger it later.
This patch exploits last_trigger timestamp that we already serialize,
hence we can eliminate the argument initial completely.
A reproducer for OnBootSec= timers:
cat >repro.c <<EOD
/*
* Compile: gcc repro.c -o repro
* Run: ./repro
*/
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <time.h>
#include <unistd.h>
int main(int argc, char *argv[]) {
char command[1024];
int pause;
struct timespec now;
while (1) {
usleep(rand() % 200000); // prevent periodic repeats
clock_gettime(CLOCK_MONOTONIC, &now);
printf("%i\n", now.tv_sec);
system("rm -f $PWD/mark");
snprintf(command, 1024, "systemd-run --user --on-boot=%i --timer-property=AccuracySec=100ms "
"touch $PWD/mark", now.tv_sec + 1);
system(command);
system("systemctl --user list-timers");
pause = (
1000000000 - now.tv_nsec)/1000 - 70000; // fiddle to hit the middle of reloading
usleep(pause > 0 ? pause : 0);
system("systemctl --user daemon-reload");
sync();
sleep(2);
if (open("./mark", 0) < 0)
if (errno == ENOENT) {
printf("mark file does not exist\n");
break;
}
}
return 0;
}
EOD
Lennart Poettering [Wed, 21 Nov 2018 10:15:35 +0000 (11:15 +0100)]
Merge pull request #10866 from yuwata/libudev-util-cleanups
libudev-util: several cleanups and tests
Lennart Poettering [Wed, 21 Nov 2018 10:07:31 +0000 (11:07 +0100)]
Merge pull request #10860 from keszybz/more-cleanup-2
Do more stuff from main macros
Yu Watanabe [Wed, 21 Nov 2018 08:29:34 +0000 (17:29 +0900)]
test: add tests for util_resolve_subsys_kernel()
Yu Watanabe [Wed, 21 Nov 2018 08:27:38 +0000 (17:27 +0900)]
libudev: make util_resolve_subsys_kernel() return negative errno
This also replaces udev_device by sd_device in the function.
Yu Watanabe [Wed, 21 Nov 2018 07:42:37 +0000 (16:42 +0900)]
udev/scsi_id: fix buffer length
Yu Watanabe [Wed, 21 Nov 2018 07:17:29 +0000 (16:17 +0900)]
test: add tests for util_replace_whitespace()
Yu Watanabe [Wed, 21 Nov 2018 07:17:36 +0000 (16:17 +0900)]
libudev-util: make util_replace_whitespace() not count leading white spaces
Zbigniew Jędrzejewski-Szmek [Tue, 20 Nov 2018 15:43:19 +0000 (16:43 +0100)]
udevd: define main through macro
This removes the call to log_close(), and refactors how fork() is done. Now
the parent also goes through normal cleanup. This isn't necessary to use the
macro, but it feels cleaner this way.
Zbigniew Jędrzejewski-Szmek [Tue, 20 Nov 2018 15:41:38 +0000 (16:41 +0100)]
udevadm: define main through macro
This removes a call to log_close(). I don't think this should matter.
The call to mac_selinux_init() is moved after parse_argv(). We probably
don't need selinux when printing help().
Zbigniew Jędrzejewski-Szmek [Tue, 20 Nov 2018 15:40:49 +0000 (16:40 +0100)]
Call mac_selinux_close() from main func macros, convert user-sessions and test-udev
Zbigniew Jędrzejewski-Szmek [Tue, 20 Nov 2018 09:22:26 +0000 (10:22 +0100)]
systemctl: define main through macro and call ask_password_agent_close() from the macro
This doesn't save us anything, but I like consistency.
Yu Watanabe [Wed, 21 Nov 2018 07:35:20 +0000 (16:35 +0900)]
libudev-util: make util_replace_*() return size_t
Yu Watanabe [Wed, 21 Nov 2018 07:32:54 +0000 (16:32 +0900)]
libudev-util: add assertions
Lennart Poettering [Tue, 20 Nov 2018 18:14:24 +0000 (19:14 +0100)]
core: run env generators with non-zero umask
For PID 1 we adjust the umask to 0, but generators should not run that
way, given that they might be implemented as shell scripts and such.
Let's hence explicitly adjust the umask for them.
We already do this for unit generators. Let's do this for env
generators, too.
Evgeny Vereshchagin [Tue, 20 Nov 2018 14:47:11 +0000 (15:47 +0100)]
tests: skip test_exec_ambientcapabilities on Travis CI under ASan
Let's not bother contributors with spurious failures nobody can't
seem to reproduce. There is an issue about that where we're trying
to figure out what's going on: https://github.com/systemd/systemd/issues/10696.
Lennart Poettering [Tue, 20 Nov 2018 18:35:30 +0000 (19:35 +0100)]
Merge pull request #10853 from poettering/thaw-containers
main: don't freeze PID 1 in containers, exit with non-zero instead
Lennart Poettering [Tue, 20 Nov 2018 18:09:37 +0000 (19:09 +0100)]
Merge pull request #10858 from poettering/tmpfiles-fixlets
more tmpfiles fixlets
Yu Watanabe [Tue, 20 Nov 2018 09:36:19 +0000 (18:36 +0900)]
portablectl: make "arg_host" const
Yu Watanabe [Tue, 20 Nov 2018 09:30:13 +0000 (18:30 +0900)]
mount-tool: use static destructor and DEFINE_MAIN_FUNCTION() macro
Yu Watanabe [Tue, 20 Nov 2018 09:24:47 +0000 (18:24 +0900)]
modules-load: use static destructor and DEFINE_MAIN_FUNCTION() macro
Yu Watanabe [Tue, 20 Nov 2018 09:21:01 +0000 (18:21 +0900)]
machinectl: use static destructor and DEFINE_MAIN_FUNCTION() macro
Zbigniew Jędrzejewski-Szmek [Tue, 20 Nov 2018 14:52:40 +0000 (15:52 +0100)]
shared/main-func: also close the polkit agent automatically
The agent is closed after the static destuctors but before the pager.
No users of DEFINE_MAIN_FUNCTION* were using a polkit agent, so this makes no
functional difference.
Zbigniew Jędrzejewski-Szmek [Tue, 20 Nov 2018 14:42:57 +0000 (15:42 +0100)]
Split out pretty-print.c and move pager.c and main-func.h to shared/
This is high-level functionality, and fits better in shared/ (which is for
our executables), than in basic/ (which is also for libraries).
Yu Watanabe [Tue, 20 Nov 2018 09:17:53 +0000 (18:17 +0900)]
machine-id: use static destructor and DEFINE_MAIN_FUNCTION() macro
Yu Watanabe [Tue, 20 Nov 2018 09:15:33 +0000 (18:15 +0900)]
loginctl: use static destructor and DEFINE_MAIN_FUNCTION() macro
Yu Watanabe [Tue, 20 Nov 2018 09:08:33 +0000 (18:08 +0900)]
locale: make "arg_host" const
Yu Watanabe [Tue, 20 Nov 2018 09:03:50 +0000 (18:03 +0900)]
hostnamed: use DEFINE_MAIN_FUNCTION() macro
This also renames context_free() to context_clear().
Yu Watanabe [Tue, 20 Nov 2018 09:00:13 +0000 (18:00 +0900)]
hibernate-resume-generator: use static destructor and DEFINE_MAIN_FUNCTION() macro
Yu Watanabe [Tue, 20 Nov 2018 08:56:47 +0000 (17:56 +0900)]
fstab-generator: use static destructor and DEFINE_MAIN_FUNCTION() macro
Yu Watanabe [Tue, 20 Nov 2018 08:52:57 +0000 (17:52 +0900)]
firstboot: use static destructor and DEFINE_MAIN_FUNCTION() macro
Yu Watanabe [Tue, 20 Nov 2018 08:46:14 +0000 (17:46 +0900)]
dissect: use static destructor and DEFINE_MAIN_FUNCTION() macro
Yu Watanabe [Tue, 20 Nov 2018 08:39:25 +0000 (17:39 +0900)]
bless-boot: use static destructor and DEFINE_MAIN_FUNCTION() macro
Yu Watanabe [Tue, 20 Nov 2018 08:18:08 +0000 (17:18 +0900)]
cryptsetup: use static destructor and DEFINE_MAIN_FUNCTION() macro
Yu Watanabe [Tue, 20 Nov 2018 06:47:27 +0000 (15:47 +0900)]
cgls: use static destructor and DEFINE_MAIN_FUNCTION() macro
Lennart Poettering [Tue, 20 Nov 2018 12:16:48 +0000 (13:16 +0100)]
main: don't freeze PID 1 in containers, exit with non-zero instead
After all we have a nice way to propagate total failures, hence let's
use it.
Lennart Poettering [Tue, 20 Nov 2018 16:03:35 +0000 (17:03 +0100)]
main: use EXIT_EXCEPTION instead of EXIT_FAILURE at two more exceptional places
Lennart Poettering [Tue, 20 Nov 2018 15:58:42 +0000 (16:58 +0100)]
nspawn: use EXIT_EXCEPTION where appropriate
Lennart Poettering [Tue, 20 Nov 2018 15:55:51 +0000 (16:55 +0100)]
exit-status: introduce EXIT_EXCEPTION mapping to 255
Yu Watanabe [Tue, 20 Nov 2018 06:42:48 +0000 (15:42 +0900)]
cgls: add const
Yu Watanabe [Tue, 20 Nov 2018 06:40:36 +0000 (15:40 +0900)]
busctl: use static destructor and DEFINE_MAIN_FUNCTION() macro
Yu Watanabe [Tue, 20 Nov 2018 06:35:07 +0000 (15:35 +0900)]
bootctl: use static destructor and DEFINE_MAIN_FUNCTION() macro
Yu Watanabe [Tue, 20 Nov 2018 06:16:08 +0000 (15:16 +0900)]
backlight: use DEFINE_MAIN_FUNCTION() macro
Yu Watanabe [Tue, 20 Nov 2018 06:14:16 +0000 (15:14 +0900)]
ask-password: use static destructor and DEFINE_MAIN_FUNCTION() macro