From 1d92819d926bec7041d1719d2eed3da05259cf93 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Fri, 16 Dec 2022 13:27:24 +0100 Subject: [PATCH] Add more progress messages at shutdown/reboot This patch changes the way progress for unmounting filesystems is displayed. To see each filesystem being unmounted Finit now must be in debug mode. A general "Unmounting filesystems ..." have been added instead as well as progress for last hook script and finall call to reboot(). Signed-off-by: Joachim Wiberg --- src/mount.c | 3 ++- src/sig.c | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/mount.c b/src/mount.c index 9c887d93..d6f6a427 100644 --- a/src/mount.c +++ b/src/mount.c @@ -97,13 +97,14 @@ static int unmount(const char *target) { int rc; + dbg("Unmounting %s", target); + rc = umount(target); if (rc) { if (errno != EBUSY) print(2, "Failed unmounting %s, error %d: %s", target, errno, strerror(errno)); return rc; } - print(0, "Unmounting %s", target); return 0; } diff --git a/src/sig.c b/src/sig.c index 2da123fd..383d3142 100644 --- a/src/sig.c +++ b/src/sig.c @@ -357,6 +357,7 @@ void do_shutdown(shutop_t op) } /* Unmount any tmpfs before unmounting swap ... */ + print(0, "Unmounting filesystems ..."); unmount_tmpfs(); fs_swapoff(); @@ -378,10 +379,12 @@ void do_shutdown(shutop_t op) mdadm_wait(); /* Last chance to run scripts (all .so plugins have exited already) */ + print(0, "Calling hook/svc/down scripts ..."); plugin_run_hooks(HOOK_SYS_DN); /* Reboot via watchdog or kernel, or shutdown? */ if (op == SHUT_REBOOT) { + print(0, "Rebooting ..."); if (wdog && wdog->pid > 1) { int timeout = 10; @@ -394,12 +397,12 @@ void do_shutdown(shutop_t op) dbg("Rebooting ..."); reboot(RB_AUTOBOOT); } else if (op == SHUT_OFF) { - dbg("Powering down ..."); + print(0, "Powering down ..."); reboot(RB_POWER_OFF); } /* Also fallback if any of the other two fails */ - dbg("Halting ..."); + print(0, "Halting ..."); reboot(RB_HALT_SYSTEM); }