summaryrefslogtreecommitdiff
path: root/src/shutdown
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2023-04-21 12:34:37 +0200
committerLennart Poettering <lennart@poettering.net>2023-04-21 12:41:15 +0200
commit67458536afcdceb25b63b8367837ab5402f3983e (patch)
tree151dd10f3a6ea5766ce393594e0d09c0a6739d1f /src/shutdown
parent21453b8b4bfb4d1fa3efd1df3fe1208d48cbd41b (diff)
downloadsystemd-67458536afcdceb25b63b8367837ab5402f3983e.tar.gz
tree-wide: convert more cases do DEVNUM_FORMAT_STR()/DEVNUM_FORMAT_VAL()
Let's use our nice macros a bit more. (Not comprehensive)
Diffstat (limited to 'src/shutdown')
-rw-r--r--src/shutdown/umount.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c
index ebd5a754c5..93e082d77e 100644
--- a/src/shutdown/umount.c
+++ b/src/shutdown/umount.c
@@ -26,6 +26,7 @@
#include "chase.h"
#include "constants.h"
#include "device-util.h"
+#include "devnum-util.h"
#include "dirent-util.h"
#include "escape.h"
#include "fd-util.h"
@@ -890,7 +891,7 @@ static int dm_points_list_detach(MountPoint **head, bool *changed, bool last_try
continue;
}
- log_info("Detaching DM %s (%u:%u).", m->path, major(m->devnum), minor(m->devnum));
+ log_info("Detaching DM %s (" DEVNUM_FORMAT_STR ").", m->path, DEVNUM_FORMAT_VAL(m->devnum));
r = delete_dm(m);
if (r < 0) {
log_full_errno(last_try ? LOG_ERR : LOG_INFO, r, "Could not detach DM %s: %m", m->path);
@@ -920,7 +921,7 @@ static int md_points_list_detach(MountPoint **head, bool *changed, bool last_try
continue;
}
- log_info("Stopping MD %s (%u:%u).", m->path, major(m->devnum), minor(m->devnum));
+ log_info("Stopping MD %s (" DEVNUM_FORMAT_STR ").", m->path, DEVNUM_FORMAT_VAL(m->devnum));
r = delete_md(m);
if (r < 0) {
log_full_errno(last_try ? LOG_ERR : LOG_INFO, r, "Could not stop MD %s: %m", m->path);