diff options
| author | Karel Zak <kzak@redhat.com> | 2025-10-14 10:58:08 +0200 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2025-10-14 10:58:08 +0200 |
| commit | 3617faadce772a5018a255acd9dcc8d35e5419d8 (patch) | |
| tree | f1b14b14c290892f2ee1a603ed736103b8c6cdc7 | |
| parent | 2e866455bfe35ca05bc4759065586d1718656b4a (diff) | |
| parent | 24478afdf0a1941e9b7049ef263677f666e73c80 (diff) | |
| download | util-linux-3617faadce772a5018a255acd9dcc8d35e5419d8.tar.gz | |
Merge branch 'fix/umount_no_verbose_for_non_root' of https://github.com/cgoesche/util-linux-fork
* 'fix/umount_no_verbose_for_non_root' of https://github.com/cgoesche/util-linux-fork:
umount: consider helper return status for success message
| -rw-r--r-- | libmount/src/context_mount.c | 2 | ||||
| -rw-r--r-- | sys-utils/umount.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c index 04734b73cd..c6d854f7a6 100644 --- a/libmount/src/context_mount.c +++ b/libmount/src/context_mount.c @@ -198,7 +198,7 @@ static int evaluate_permissions(struct libmnt_context *cxt) /* * superuser mount * - * Let's convert user, users, owenr and groups to MS_* flags + * Let's convert user, users, owner and groups to MS_* flags * to be compatible with non-root execution. * * The old deprecated way is to use mnt_optstr_get_flags(). diff --git a/sys-utils/umount.c b/sys-utils/umount.c index 18824e09f2..db2a4bee2f 100644 --- a/sys-utils/umount.c +++ b/sys-utils/umount.c @@ -138,7 +138,8 @@ static void success_message(struct libmnt_context *cxt) { const char *tgt, *src; - if (mnt_context_helper_executed(cxt) + if ((mnt_context_helper_executed(cxt) + && mnt_context_get_helper_status(cxt)) || mnt_context_get_status(cxt) != 1) return; |