diff options
| author | Michal Schmidt <mschmidt@redhat.com> | 2012-12-07 18:02:43 +0100 |
|---|---|---|
| committer | Michal Schmidt <mschmidt@redhat.com> | 2012-12-07 18:55:19 +0100 |
| commit | 735e0712710a1dc26da0febafb91b242b2687f3f (patch) | |
| tree | 20cdf85678f59cbd37b292d2b05d69a02fa48877 | |
| parent | bce93b7ac7642426039863493694d8c12812e2a7 (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.
| -rw-r--r-- | src/core/shutdown.c | 8 | ||||
| -rw-r--r-- | src/core/umount.c | 10 |
2 files changed, 9 insertions, 9 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) { diff --git a/src/core/umount.c b/src/core/umount.c index fd90d9f404..96232d38db 100644 --- a/src/core/umount.c +++ b/src/core/umount.c @@ -465,7 +465,7 @@ static int swap_points_list_off(MountPoint **head, bool *changed) { assert(head); LIST_FOREACH_SAFE(mount_point, m, n, *head) { - log_info("Disabling swap %s.", m->path); + log_info("Deactivating swap %s.", m->path); if (swapoff(m->path) == 0) { if (changed) *changed = true; @@ -501,7 +501,7 @@ static int loopback_points_list_detach(MountPoint **head, bool *changed) { continue; } - log_info("Deleting loopback %s.", m->path); + log_info("Detaching loopback %s.", m->path); r = delete_loopback(m->path); if (r >= 0) { if (r > 0 && changed) @@ -509,7 +509,7 @@ static int loopback_points_list_detach(MountPoint **head, bool *changed) { mount_point_free(head, m); } else { - log_warning("Could not delete loopback %s: %m", m->path); + log_warning("Could not detach loopback %s: %m", m->path); n_failed++; } } @@ -536,7 +536,7 @@ static int dm_points_list_detach(MountPoint **head, bool *changed) { continue; } - log_info("Deleting DM %u:%u.", major(m->devnum), minor(m->devnum)); + log_info("Detaching DM %u:%u.", major(m->devnum), minor(m->devnum)); r = delete_dm(m->devnum); if (r >= 0) { if (changed) @@ -544,7 +544,7 @@ static int dm_points_list_detach(MountPoint **head, bool *changed) { mount_point_free(head, m); } else { - log_warning("Could not delete DM %s: %m", m->path); + log_warning("Could not detach DM %s: %m", m->path); n_failed++; } } |