summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2021-06-01 22:26:49 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2021-07-09 18:45:27 +0200
commit264f179b692843fbb5de2e111b85e6e8bb837e68 (patch)
tree43e15fd9dd9fafcdccf9d08964a1251366347bd9 /src/core
parentf564342089ab56e44bf7240d19b860f2ed003e58 (diff)
downloadsystemd-264f179b692843fbb5de2e111b85e6e8bb837e68.tar.gz
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. (cherry picked from commit 3ebc9b9b30b04a3aeec55a11022b337ec5fdb5cf)
Diffstat (limited to 'src/core')
-rw-r--r--src/core/mount.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/core/mount.c b/src/core/mount.c
index ca5d0939a1..5a757c4b1d 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -1690,11 +1690,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);