diff options
| author | Karel Zak | 2014-08-21 14:58:40 +0200 |
|---|---|---|
| committer | Karel Zak | 2014-08-21 14:58:40 +0200 |
| commit | e4ea53de0b6bc31303fdfc9ebb546bce4527c5d6 (patch) | |
| tree | f713c4bb9af456eb6ce3f6a1968bf6280d786c5d /libmount/src/context_umount.c | |
| parent | tests: apply travis clang PATH workaround (diff) | |
| download | kernel-qcow2-util-linux-e4ea53de0b6bc31303fdfc9ebb546bce4527c5d6.tar.gz kernel-qcow2-util-linux-e4ea53de0b6bc31303fdfc9ebb546bce4527c5d6.tar.xz kernel-qcow2-util-linux-e4ea53de0b6bc31303fdfc9ebb546bce4527c5d6.zip | |
libmount: use -t for type.subtype in helpers API
References: https://github.com/karelzak/util-linux/issues/116
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libmount/src/context_umount.c')
| -rw-r--r-- | libmount/src/context_umount.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libmount/src/context_umount.c b/libmount/src/context_umount.c index 220f28bc6..73e8214c8 100644 --- a/libmount/src/context_umount.c +++ b/libmount/src/context_umount.c @@ -559,9 +559,11 @@ static int exec_helper(struct libmnt_context *cxt) args[i++] = "-v"; /* 6 */ if (mnt_context_is_rdonly_umount(cxt)) args[i++] = "-r"; /* 7 */ - if (type && !endswith(cxt->helper, type)) { + if (type + && strchr(type, '.') + && !endswith(cxt->helper, type)) { args[i++] = "-t"; /* 8 */ - args[i++] = (char *) type; /* 9 */ + args[i++] = (char *) type; /* 9 */ } args[i] = NULL; /* 10 */ |