diff options
| author | Lennart Poettering <lennart@poettering.net> | 2019-07-12 10:42:31 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2019-07-13 11:05:07 +0200 |
| commit | e7ac08e4e0fc8487592c436233bd257d8888e185 (patch) | |
| tree | c1ff761ffab8b6a7c22bc0ef88d5e2edb07b2f20 /src/shutdown | |
| parent | shutdown: bump kmsg log level to LOG_WARNING only (diff) | |
| download | systemd-e7ac08e4e0fc8487592c436233bd257d8888e185.tar.xz systemd-e7ac08e4e0fc8487592c436233bd257d8888e185.zip | |
shutdown: merge variable declaration lines a bit
Diffstat (limited to 'src/shutdown')
| -rw-r--r-- | src/shutdown/shutdown.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c index 45f3461547..a574a07041 100644 --- a/src/shutdown/shutdown.c +++ b/src/shutdown/shutdown.c @@ -295,13 +295,11 @@ static void bump_sysctl_printk_log_level(int min_level) { } int main(int argc, char *argv[]) { - bool need_umount, need_swapoff, need_loop_detach, need_dm_detach; - bool in_container, use_watchdog = false, can_initrd; + bool need_umount, need_swapoff, need_loop_detach, need_dm_detach, in_container, use_watchdog = false, can_initrd; _cleanup_free_ char *cgroup = NULL; - char *arguments[3]; + char *arguments[3], *watchdog_device; int cmd, r, umount_log_level = LOG_INFO; static const char* const dirs[] = {SYSTEM_SHUTDOWN_PATH, NULL}; - char *watchdog_device; /* The log target defaults to console, but the original systemd process will pass its log target in through a * command line argument, which will override this default. Also, ensure we'll never log to the journal or |