summaryrefslogtreecommitdiff
path: root/src/core/shutdown.c
diff options
context:
space:
mode:
authorMichal Schmidt <mschmidt@redhat.com>2012-12-07 18:02:43 +0100
committerMichal Schmidt <mschmidt@redhat.com>2012-12-07 18:55:19 +0100
commit735e0712710a1dc26da0febafb91b242b2687f3f (patch)
tree20cdf85678f59cbd37b292d2b05d69a02fa48877 /src/core/shutdown.c
parentbce93b7ac7642426039863493694d8c12812e2a7 (diff)
shutdown, umount: use verbs consistently
Mounts are "unmounted". Swaps are "deactivated", not "turned off" nor "disabled". Loop and DM devices are "detached", not "deleted". Especially the deleting sounded a bit scary.
Diffstat (limited to 'src/core/shutdown.c')
-rw-r--r--src/core/shutdown.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/shutdown.c b/src/core/shutdown.c
index 67830080f9..0b0e0c3d47 100644
--- a/src/core/shutdown.c
+++ b/src/core/shutdown.c
@@ -207,15 +207,15 @@ int main(int argc, char *argv[]) {
}
if (need_swapoff) {
- log_info("Disabling swaps.");
+ log_info("Deactivating swaps.");
r = swapoff_all(&changed);
if (r == 0) {
need_swapoff = false;
- log_info("All swaps disabled.");
+ log_info("All swaps deactivated.");
} 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
- log_error("Failed to turn off swaps: %s", strerror(-r));
+ log_error("Failed to deactivate swaps: %s", strerror(-r));
}
if (need_loop_detach) {