From 3ebc9b9b30b04a3aeec55a11022b337ec5fdb5cf Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 1 Jun 2021 22:26:49 +0200 Subject: [PATCH] mount: be more descriptive when logging about overly long mount point paths This is prompted by #17684: let's very explicitly say that the name is too long for us, and that we'll ignore it. --- src/core/mount.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/core/mount.c b/src/core/mount.c index 07d8e7b9857..c1f36ac4f14 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -1713,11 +1713,18 @@ static int mount_setup_unit( .burst = 1, }; + if (r == -ENAMETOOLONG) + return log_struct_errno( + ratelimit_below(&rate_limit) ? LOG_WARNING : LOG_DEBUG, r, + "MESSAGE_ID=" SD_MESSAGE_MOUNT_POINT_PATH_NOT_SUITABLE_STR, + "MOUNT_POINT=%s", where, + LOG_MESSAGE("Mount point path '%s' too long to fit into unit name, ignoring mount point.", where)); + return log_struct_errno( ratelimit_below(&rate_limit) ? LOG_WARNING : LOG_DEBUG, r, "MESSAGE_ID=" SD_MESSAGE_MOUNT_POINT_PATH_NOT_SUITABLE_STR, "MOUNT_POINT=%s", where, - LOG_MESSAGE("Failed to generate valid unit name from path '%s', ignoring mount point: %m", where)); + LOG_MESSAGE("Failed to generate valid unit name from mount point path '%s', ignoring mount point: %m", where)); } u = manager_get_unit(m, e); -- 2.47.3