diff options
| author | Michal Sekletar <msekleta@redhat.com> | 2016-01-24 16:08:36 +0100 |
|---|---|---|
| committer | Michal Sekletar <msekleta@redhat.com> | 2016-01-26 14:13:13 +0100 |
| commit | 1359fffa573f42463e3b369df5e57b0c33821a61 (patch) | |
| tree | aaad55627476a203951b218db9d971a3dcf35fd2 /src/core | |
| parent | afb3e6335a7e75afa24db9dff6860f45f0fcc940 (diff) | |
shutdown: complain if process excluded from killing spree runs of the same rootfs as PID1
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/killall.c | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/src/core/killall.c b/src/core/killall.c index 77f145b4d1..d0c7c89670 100644 --- a/src/core/killall.c +++ b/src/core/killall.c @@ -37,7 +37,7 @@ #define TIMEOUT_USEC (10 * USEC_PER_SEC) -static bool ignore_proc(pid_t pid) { +static bool ignore_proc(pid_t pid, bool warn_rootfs) { _cleanup_fclose_ FILE *f = NULL; char c; const char *p; @@ -72,7 +72,22 @@ static bool ignore_proc(pid_t pid) { * spree. * * http://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons */ - if (count == 1 && c == '@') + if (c == '@' && warn_rootfs) { + _cleanup_free_ char *comm = NULL; + + r = pid_from_same_root_fs(pid); + if (r < 0) + return true; + + get_process_comm(pid, &comm); + + if (r) + log_notice("Process " PID_FMT " (%s) has been 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)); + return true; + } else if (c == '@') return true; return false; @@ -171,7 +186,7 @@ static int killall(int sig, Set *pids, bool send_sighup) { if (parse_pid(d->d_name, &pid) < 0) continue; - if (ignore_proc(pid)) + if (ignore_proc(pid, sig == SIGKILL && !in_initrd())) continue; if (sig == SIGKILL) { |