diff options
| author | Michal Schmidt <mschmidt@redhat.com> | 2012-12-07 17:44:50 +0100 |
|---|---|---|
| committer | Michal Schmidt <mschmidt@redhat.com> | 2012-12-07 17:44:50 +0100 |
| commit | bce93b7ac7642426039863493694d8c12812e2a7 (patch) | |
| tree | a766c0fe9da04b20d09de8c554979feb7c9116ed /src/core/shutdown.c | |
| parent | c678406681d32d56730b9e9c002d5500d7aa7f8b (diff) | |
shutdown, umount: logging improvements
In bugreports about hangs during the late shutdown we are often missing
important information - what were we trying to unmount/detach when it hung.
Instead of printing what we successfully unmounted, print what we are
going to unmount/detach. And add messages to mark the completion of
categories (mount/swap/loop/DM).
Diffstat (limited to 'src/core/shutdown.c')
| -rw-r--r-- | src/core/shutdown.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/core/shutdown.c b/src/core/shutdown.c index 192746a95..67830080f 100644 --- a/src/core/shutdown.c +++ b/src/core/shutdown.c @@ -197,9 +197,10 @@ int main(int argc, char *argv[]) { if (need_umount) { log_info("Unmounting file systems."); r = umount_all(&changed); - if (r == 0) + if (r == 0) { need_umount = false; - else if (r > 0) + log_info("All filesystems unmounted."); + } else if (r > 0) log_info("Not all file systems unmounted, %d left.", r); else log_error("Failed to unmount file systems: %s", strerror(-r)); @@ -208,9 +209,10 @@ int main(int argc, char *argv[]) { if (need_swapoff) { log_info("Disabling swaps."); r = swapoff_all(&changed); - if (r == 0) + if (r == 0) { need_swapoff = false; - else if (r > 0) + log_info("All swaps disabled."); + } else if (r > 0) log_info("Not all swaps are turned off, %d left.", r); else log_error("Failed to turn off swaps: %s", strerror(-r)); @@ -219,9 +221,10 @@ int main(int argc, char *argv[]) { if (need_loop_detach) { log_info("Detaching loop devices."); r = loopback_detach_all(&changed); - if (r == 0) + if (r == 0) { need_loop_detach = false; - else if (r > 0) + log_info("All loop devices detached."); + } else if (r > 0) log_info("Not all loop devices detached, %d left.", r); else log_error("Failed to detach loop devices: %s", strerror(-r)); @@ -230,9 +233,10 @@ int main(int argc, char *argv[]) { if (need_dm_detach) { log_info("Detaching DM devices."); r = dm_detach_all(&changed); - if (r == 0) + if (r == 0) { need_dm_detach = false; - else if (r > 0) + log_info("All DM devices detached."); + } else if (r > 0) log_info("Not all DM devices detached, %d left.", r); else log_error("Failed to detach DM devices: %s", strerror(-r)); |