diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-10-14 00:49:22 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-10-14 00:49:22 +0200 |
| commit | 567ea02a89b358090032c8d1ec89286db07ab2ff (patch) | |
| tree | 8c61745ea3e44d7d27f91aa412832c1df1b8ecef /src/shutdown.c | |
| parent | umount: be a bit more verbose when unable to umount/unswap/delete loopbacks (diff) | |
| download | systemd-567ea02a89b358090032c8d1ec89286db07ab2ff.tar.xz systemd-567ea02a89b358090032c8d1ec89286db07ab2ff.zip | |
shutdown: don't chdir to /, since init is running with / as cwd anyway
Diffstat (limited to 'src/shutdown.c')
| -rw-r--r-- | src/shutdown.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/shutdown.c b/src/shutdown.c index b78c74112a..3c9a53126f 100644 --- a/src/shutdown.c +++ b/src/shutdown.c @@ -36,7 +36,7 @@ #include "umount.h" #include "util.h" -#define TIMEOUT_USEC (5 * USEC_PER_SEC) +#define TIMEOUT_USEC (5 * USEC_PER_SEC) #define FINALIZE_ATTEMPTS 50 #define FINALIZE_CRITICAL_ATTEMPTS 10 @@ -198,7 +198,6 @@ finish: return r; } - int main(int argc, char *argv[]) { int cmd, r, retries; bool need_umount = true, need_swapoff = true, need_loop_detach = true; @@ -208,7 +207,7 @@ int main(int argc, char *argv[]) { log_open(); if (getpid() != 1) { - log_error("Not executed by init (pid-1)."); + log_error("Not executed by init (pid 1)."); r = -EPERM; goto error; } @@ -247,12 +246,7 @@ int main(int argc, char *argv[]) { if (r < 0) log_warning("Cannot send SIGKILL to all process: %s", strerror(r)); - - /* preventing that we won't block umounts */ - if (chdir("/") != 0) - log_warning("Cannot chdir(\"/\"): %m. Unmounts likely to fail."); - - /* umount all mountpoints, swaps, and loopback devices */ + /* Unmount all mountpoints, swaps, and loopback devices */ retries = FINALIZE_ATTEMPTS; while (need_umount || need_swapoff || need_loop_detach) { if (need_umount) { |