mount-setup: port to logging about mount attempts via mount_*follow_verbose()

This commit is contained in:
Lennart Poettering
2023-05-16 10:00:04 +02:00
parent f44744ff51
commit 4900c3e5b1
+3 -5
View File
@@ -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)