chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: add transient units
[elogind.git]
/
src
/
core
/
shutdown.c
diff --git
a/src/core/shutdown.c
b/src/core/shutdown.c
index 67830080f9b2f07467f74874420120c7ea661bcd..2db761de36651c7dcc23cf844a97a849bf2d8b32 100644
(file)
--- a/
src/core/shutdown.c
+++ b/
src/core/shutdown.c
@@
-207,15
+207,15
@@
int main(int argc, char *argv[]) {
}
if (need_swapoff) {
}
if (need_swapoff) {
- log_info("D
isabl
ing swaps.");
+ log_info("D
eactivat
ing swaps.");
r = swapoff_all(&changed);
if (r == 0) {
need_swapoff = false;
r = swapoff_all(&changed);
if (r == 0) {
need_swapoff = false;
- log_info("All swaps d
isabl
ed.");
+ log_info("All swaps d
eactivat
ed.");
} else if (r > 0)
} else if (r > 0)
- log_info("Not all swaps
are turned off
, %d left.", r);
+ log_info("Not all swaps
deactivated
, %d left.", r);
else
else
- log_error("Failed to
turn off
swaps: %s", strerror(-r));
+ log_error("Failed to
deactivate
swaps: %s", strerror(-r));
}
if (need_loop_detach) {
}
if (need_loop_detach) {
@@
-261,6
+261,8
@@
int main(int argc, char *argv[]) {
if (retries >= FINALIZE_ATTEMPTS)
log_error("Too many iterations, giving up.");
if (retries >= FINALIZE_ATTEMPTS)
log_error("Too many iterations, giving up.");
+ else
+ log_info("Storage is finalized.");
arguments[0] = NULL;
arguments[1] = argv[1];
arguments[0] = NULL;
arguments[1] = argv[1];
@@
-272,6
+274,9
@@
int main(int argc, char *argv[]) {
if (prepare_new_root() >= 0 &&
pivot_to_new_root() >= 0) {
if (prepare_new_root() >= 0 &&
pivot_to_new_root() >= 0) {
+
+ log_info("Returning to initrd...");
+
execv("/shutdown", argv);
log_error("Failed to execute shutdown binary: %m");
}
execv("/shutdown", argv);
log_error("Failed to execute shutdown binary: %m");
}