diff options
| author | Karel Zak <kzak@redhat.com> | 2024-04-23 10:29:37 +0200 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2024-04-23 10:29:37 +0200 |
| commit | a20e7e23a8565e01b1c84de6924d1fbbdb1cfccc (patch) | |
| tree | 799061cd5854854970799e23d2c1e9aa12c86c90 | |
| parent | 60546acc885243c94a7aa95e00e9105fa88a8fe6 (diff) | |
| download | util-linux-a20e7e23a8565e01b1c84de6924d1fbbdb1cfccc.tar.gz | |
libmount: fix umount --read-only
Reported-by: Krzysztof Olędzki <ole@ans.pl>
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | libmount/src/context_umount.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libmount/src/context_umount.c b/libmount/src/context_umount.c index 79b62378d8..bf70ed2ee7 100644 --- a/libmount/src/context_umount.c +++ b/libmount/src/context_umount.c @@ -267,6 +267,9 @@ static int lookup_umount_fs_by_statfs(struct libmnt_context *cxt, const char *tg * So, let's use statfs() if possible (it's bad idea for --lazy/--force * umounts as target is probably unreachable NFS, also for --detach-loop * as this additionally needs to know the name of the loop device). + * + * For the "umount --read-only" command, we need to read the mountinfo + * to obtain the mount source. */ if (mnt_context_is_restricted(cxt) || *tgt != '/' @@ -275,6 +278,7 @@ static int lookup_umount_fs_by_statfs(struct libmnt_context *cxt, const char *tg || mnt_context_is_lazy(cxt) || mnt_context_is_nocanonicalize(cxt) || mnt_context_is_loopdel(cxt) + || mnt_context_is_rdonly_umount(cxt) || mnt_safe_stat(tgt, &st) != 0 || !S_ISDIR(st.st_mode) || has_utab_entry(cxt, tgt)) return 1; /* not found */ |