summaryrefslogtreecommitdiff
path: root/src/core/mount.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2021-06-01 22:26:49 +0200
committerLennart Poettering <lennart@poettering.net>2021-06-01 23:08:21 +0200
commit3ebc9b9b30b04a3aeec55a11022b337ec5fdb5cf (patch)
tree5fc02a5d90f98f6661e62c4709a7e02a912dd2c8 /src/core/mount.c
parent598a6a8491abd311d36b11caf262123fbbffb2c0 (diff)
downloadsystemd-3ebc9b9b30b04a3aeec55a11022b337ec5fdb5cf.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.
Diffstat (limited to 'src/core/mount.c')
-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 07d8e7b985..c1f36ac4f1 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);