diff options
author | Karel Zak | 2011-04-01 09:03:39 +0200 |
---|---|---|
committer | Karel Zak | 2011-04-01 09:03:39 +0200 |
commit | f19c952b2fc07ddd7a698cf3a213a9a16d13e7ba (patch) | |
tree | eb591be7c2d1b45cff2595770e7fecf0b92f4be8 /shlibs/mount | |
parent | libmount: support /run/mount rather than /dev/.mount (diff) | |
download | kernel-qcow2-util-linux-f19c952b2fc07ddd7a698cf3a213a9a16d13e7ba.tar.gz kernel-qcow2-util-linux-f19c952b2fc07ddd7a698cf3a213a9a16d13e7ba.tar.xz kernel-qcow2-util-linux-f19c952b2fc07ddd7a698cf3a213a9a16d13e7ba.zip |
umount: use helper= for all UIDs
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'shlibs/mount')
-rw-r--r-- | shlibs/mount/src/context_umount.c | 6 | ||||
-rw-r--r-- | shlibs/mount/src/libmount.h.in | 2 | ||||
-rw-r--r-- | shlibs/mount/src/optmap.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/shlibs/mount/src/context_umount.c b/shlibs/mount/src/context_umount.c index 08b0fd46c..e10af52f2 100644 --- a/shlibs/mount/src/context_umount.c +++ b/shlibs/mount/src/context_umount.c @@ -584,9 +584,9 @@ int mnt_context_prepare_umount(struct libmnt_context *cxt) if (!rc && !cxt->helper) { - if (!cxt->restricted && (cxt->user_mountflags & MNT_MS_PHELPER)) - /* on phelper= mount option based helper */ - rc = prepare_helper_from_options(cxt, "phelper"); + if (cxt->user_mountflags & MNT_MS_HELPER) + /* on helper= mount option based helper */ + rc = prepare_helper_from_options(cxt, "helper"); if (!rc && !cxt->helper) /* on fstype based helper */ diff --git a/shlibs/mount/src/libmount.h.in b/shlibs/mount/src/libmount.h.in index 173872699..4eba4c748 100644 --- a/shlibs/mount/src/libmount.h.in +++ b/shlibs/mount/src/libmount.h.in @@ -439,7 +439,7 @@ extern int mnt_context_do_umount(struct libmnt_context *cxt); #define MNT_MS_LOOP (1 << 9) #define MNT_MS_NOFAIL (1 << 10) #define MNT_MS_UHELPER (1 << 11) -#define MNT_MS_PHELPER (1 << 12) +#define MNT_MS_HELPER (1 << 12) /* * mount(2) MS_* masks (MNT_MAP_LINUX map) diff --git a/shlibs/mount/src/optmap.c b/shlibs/mount/src/optmap.c index 4924e9ae3..acd76173f 100644 --- a/shlibs/mount/src/optmap.c +++ b/shlibs/mount/src/optmap.c @@ -155,7 +155,7 @@ static const struct libmnt_optmap userspace_opts_map[] = { "uhelper=", MNT_MS_UHELPER }, /* /sbin/umount.<helper> */ - { "phelper=", MNT_MS_PHELPER }, /* /sbin/umount.<helper> */ + { "helper=", MNT_MS_HELPER }, /* /sbin/umount.<helper> */ { NULL, 0, 0 } }; |