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 (parent:
567ea02
)
shutdown: execute rescue kill only once
author
Lennart Poettering
<lennart@poettering.net>
Wed, 13 Oct 2010 22:49:53 +0000
(
00:49
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Wed, 13 Oct 2010 22:49:53 +0000
(
00:49
+0200)
src/shutdown.c
patch
|
blob
|
history
diff --git
a/src/shutdown.c
b/src/shutdown.c
index 3c9a53126f208a4e4fcb8fcb9152850eeae29b48..43165fefa7a77894ea88aa24cd8a038d7ae623c3 100644
(file)
--- a/
src/shutdown.c
+++ b/
src/shutdown.c
@@
-286,18
+286,18
@@
int main(int argc, char *argv[]) {
if (need_umount || need_swapoff || need_loop_detach) {
retries--;
if (need_umount || need_swapoff || need_loop_detach) {
retries--;
- if (retries
<
= FINALIZE_CRITICAL_ATTEMPTS) {
+ if (retries
=
= FINALIZE_CRITICAL_ATTEMPTS) {
log_warning("Approaching critical level to finalize filesystem and devices, try to kill all processes.");
rescue_send_signal(SIGTERM);
rescue_send_signal(SIGKILL);
}
if (retries > 0)
log_warning("Approaching critical level to finalize filesystem and devices, try to kill all processes.");
rescue_send_signal(SIGTERM);
rescue_send_signal(SIGKILL);
}
if (retries > 0)
- log_info("Action still required, %d tries left", retries);
+ log_info("Action still required, %d tries left
.
", retries);
else {
else {
- log_error("
Tried enough but still action required need_umount=%d, need_swapoff=%d, need_loop_detach=%d", need_umount, need_swapoff, need_loop_detach);
-
r = -EBUSY
;
-
goto error
;
+ log_error("
Giving up. Actions left: Umount=%s, Swap off=%s, Loop detach=%s",
+
yes_no(need_umount), yes_no(need_swapoff), yes_no(need_loop_detach))
;
+
break
;
}
}
}
}
}
}