chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
7e23b34
)
shutdown: don't chdir to /, since init is running with / as cwd anyway
author
Lennart Poettering
<lennart@poettering.net>
Wed, 13 Oct 2010 22:49:22 +0000
(
00:49
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Wed, 13 Oct 2010 22:49:22 +0000
(
00:49
+0200)
src/shutdown.c
patch
|
blob
|
history
diff --git
a/src/shutdown.c
b/src/shutdown.c
index b78c74112a0c1930703e9c88963de4562cd246e6..3c9a53126f208a4e4fcb8fcb9152850eeae29b48 100644
(file)
--- a/
src/shutdown.c
+++ b/
src/shutdown.c
@@
-36,7
+36,7
@@
#include "umount.h"
#include "util.h"
#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
#define FINALIZE_ATTEMPTS 50
#define FINALIZE_CRITICAL_ATTEMPTS 10
@@
-198,7
+198,6
@@
finish:
return r;
}
return r;
}
-
int main(int argc, char *argv[]) {
int cmd, r, retries;
bool need_umount = true, need_swapoff = true, need_loop_detach = true;
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_open();
if (getpid() != 1) {
- log_error("Not executed by init (pid
-
1).");
+ log_error("Not executed by init (pid
1).");
r = -EPERM;
goto error;
}
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));
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) {
retries = FINALIZE_ATTEMPTS;
while (need_umount || need_swapoff || need_loop_detach) {
if (need_umount) {