summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2023-05-15 11:52:33 +0200
committerLennart Poettering <lennart@poettering.net>2023-05-16 10:00:04 +0200
commit4900c3e5b14cb03d845853b23ad1ff47ce7c6e34 (patch)
tree026dc6de1ca72a745ed3acb1f094fe899ccb22a6 /src
parentf44744ff5120482e8a1f6222f091bd97dc65ed85 (diff)
downloadsystemd-4900c3e5b14cb03d845853b23ad1ff47ce7c6e34.tar.gz
mount-setup: port to logging about mount attempts via mount_*follow_verbose()
Diffstat (limited to 'src')
-rw-r--r--src/shared/mount-setup.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/shared/mount-setup.c b/src/shared/mount-setup.c
index a920e8a92a..e5247bd928 100644
--- a/src/shared/mount-setup.c
+++ b/src/shared/mount-setup.c
@@ -186,13 +186,11 @@ static int mount_one(const MountPoint *p, bool relabel) {
strna(p->options));
if (FLAGS_SET(p->mode, MNT_FOLLOW_SYMLINK))
- r = RET_NERRNO(mount(p->what, p->where, p->type, p->flags, p->options));
+ r = mount_follow_verbose(priority, p->what, p->where, p->type, p->flags, p->options);
else
- r = mount_nofollow(p->what, p->where, p->type, p->flags, p->options);
- if (r < 0) {
- log_full_errno(priority, r, "Failed to mount %s at %s: %m", p->type, p->where);
+ r = mount_nofollow_verbose(priority, p->what, p->where, p->type, p->flags, p->options);
+ if (r < 0)
return (p->mode & MNT_FATAL) ? r : 0;
- }
/* Relabel again, since we now mounted something fresh here */
if (relabel)