diff options
Diffstat (limited to 'src/grp-system/libcore/killall.c')
| -rw-r--r-- | src/grp-system/libcore/killall.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/grp-system/libcore/killall.c b/src/grp-system/libcore/killall.c index bc4d67ae21..27946f1f84 100644 --- a/src/grp-system/libcore/killall.c +++ b/src/grp-system/libcore/killall.c @@ -23,6 +23,7 @@ #include <unistd.h> #include "basic/alloc-util.h" +#include "basic/def.h" #include "basic/fd-util.h" #include "basic/formats-util.h" #include "basic/parse-util.h" @@ -34,8 +35,6 @@ #include "killall.h" -#define TIMEOUT_USEC (10 * USEC_PER_SEC) - static bool ignore_proc(pid_t pid, bool warn_rootfs) { _cleanup_fclose_ FILE *f = NULL; char c; @@ -81,7 +80,7 @@ static bool ignore_proc(pid_t pid, bool warn_rootfs) { get_process_comm(pid, &comm); if (r) - log_notice("Process " PID_FMT " (%s) has been been marked to be excluded from killing. It is " + log_notice("Process " PID_FMT " (%s) has been marked to be excluded from killing. It is " "running from the root file system, and thus likely to block re-mounting of the " "root file system to read-only. Please consider moving it into an initrd file " "system instead.", pid, strna(comm)); @@ -100,7 +99,7 @@ static void wait_for_children(Set *pids, sigset_t *mask) { if (set_isempty(pids)) return; - until = now(CLOCK_MONOTONIC) + TIMEOUT_USEC; + until = now(CLOCK_MONOTONIC) + DEFAULT_TIMEOUT_USEC; for (;;) { struct timespec ts; int k; |