diff options
| author | Karel Zak | 2012-01-23 12:28:05 +0100 |
|---|---|---|
| committer | Karel Zak | 2012-01-23 12:28:05 +0100 |
| commit | ac8ecab4bec840a381b1e901e905ca78f7c3e453 (patch) | |
| tree | a563a00634bf1f2218e77219f25b3292a7cc825c /sys-utils/umount.c | |
| parent | libmount: export info about library features (diff) | |
| download | kernel-qcow2-util-linux-ac8ecab4bec840a381b1e901e905ca78f7c3e453.tar.gz kernel-qcow2-util-linux-ac8ecab4bec840a381b1e901e905ca78f7c3e453.tar.xz kernel-qcow2-util-linux-ac8ecab4bec840a381b1e901e905ca78f7c3e453.zip | |
mount: add info about libmount features to --version output
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'sys-utils/umount.c')
| -rw-r--r-- | sys-utils/umount.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/sys-utils/umount.c b/sys-utils/umount.c index f19d18bdc..20a2c1af7 100644 --- a/sys-utils/umount.c +++ b/sys-utils/umount.c @@ -44,17 +44,27 @@ static int table_parser_errcb(struct libmnt_table *tb __attribute__((__unused__) return 0; } + static void __attribute__((__noreturn__)) print_version(void) { const char *ver = NULL; + const char **features = NULL, **p; mnt_get_library_version(&ver); - - printf(_("%s from %s (libmount %s)\n"), - program_invocation_short_name, PACKAGE_STRING, ver); + mnt_get_library_features(&features); + + printf(_("%s from %s (libmount %s"), + program_invocation_short_name, + PACKAGE_STRING, + ver); + p = features; + while (p && *p) { + fputs(p == features ? ": " : ", ", stdout); + fputs(*p++, stdout); + } + fputs(")\n", stdout); exit(MOUNT_EX_SUCCESS); } - static void __attribute__((__noreturn__)) usage(FILE *out) { fputs(USAGE_HEADER, out); @@ -66,7 +76,7 @@ static void __attribute__((__noreturn__)) usage(FILE *out) fputs(USAGE_OPTIONS, out); fprintf(out, _( - " -a, --all mount all filesystems mentioned in fstab\n" + " -a, --all umount all filesystems\n" " -c, --no-canonicalize don't canonicalize paths\n" " -d, --detach-loop if mounted loop device, also free this loop device\n" " --fake dry run; skip the umount(2) syscall\n" |