diff options
| author | Lennart Poettering <lennart@poettering.net> | 2020-09-22 16:32:07 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2020-09-23 18:57:36 +0200 |
| commit | 30f5d10421e6b1a22cf5d707a9c90c32914bce6b (patch) | |
| tree | e12688a4e9874039917ada0f25159f7b0f7aeb30 /src/core/automount.c | |
| parent | mount-util: switch most mount_verbose() code over to not follow symlinks (diff) | |
| download | systemd-30f5d10421e6b1a22cf5d707a9c90c32914bce6b.tar.xz systemd-30f5d10421e6b1a22cf5d707a9c90c32914bce6b.zip | |
mount-util: rework umount_verbose() to take log level and flags arg
Let's make umount_verbose() more like mount_verbose_xyz(), i.e. take log
level and flags param. In particular the latter matters, since we
typically don't actually want to follow symlinks when unmounting.
Diffstat (limited to 'src/core/automount.c')
| -rw-r--r-- | src/core/automount.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/automount.c b/src/core/automount.c index 8318deef8a..b0d43a3ef4 100644 --- a/src/core/automount.c +++ b/src/core/automount.c @@ -94,7 +94,7 @@ static void unmount_autofs(Automount *a) { automount_send_ready(a, a->expire_tokens, -EHOSTDOWN); if (a->where) { - r = repeat_unmount(a->where, MNT_DETACH); + r = repeat_unmount(a->where, MNT_DETACH|UMOUNT_NOFOLLOW); if (r < 0) log_error_errno(r, "Failed to unmount: %m"); } @@ -647,7 +647,7 @@ fail: safe_close_pair(p); if (mounted) { - r = repeat_unmount(a->where, MNT_DETACH); + r = repeat_unmount(a->where, MNT_DETACH|UMOUNT_NOFOLLOW); if (r < 0) log_error_errno(r, "Failed to unmount, ignoring: %m"); } |