| Message ID | 1414145000-16669-1-git-send-email-kzak@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 10/24/2014 06:03 AM, Karel Zak wrote: > Let's print verbose messages like original non-libmount version. > > Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=923582 > Signed-off-by: Karel Zak <kzak@redhat.com> Committed.... Thanks! steved. > --- > utils/mount/mount_libmount.c | 14 +++++++++++++- > 1 file changed, 13 insertions(+), 1 deletion(-) > > diff --git a/utils/mount/mount_libmount.c b/utils/mount/mount_libmount.c > index 6f85dc9..fa46d54 100644 > --- a/utils/mount/mount_libmount.c > +++ b/utils/mount/mount_libmount.c > @@ -174,7 +174,7 @@ static int umount_main(struct libmnt_context *cxt, int argc, char **argv) > { > int rc, c; > char *spec = NULL, *opts = NULL; > - int ret = EX_FAIL; > + int ret = EX_FAIL, verbose = 0; > > static const struct option longopts[] = { > { "force", 0, 0, 'f' }, > @@ -201,6 +201,8 @@ static int umount_main(struct libmnt_context *cxt, int argc, char **argv) > return EX_USAGE; > } > > + verbose = mnt_context_is_verbose(cxt); > + > if (optind < argc) > spec = argv[optind++]; > > @@ -228,6 +230,10 @@ static int umount_main(struct libmnt_context *cxt, int argc, char **argv) > goto err; > } > > + if (verbose) > + printf(_("%s: %s mount point detected\n"), spec, > + mnt_context_get_fstype(cxt)); > + > opts = retrieve_mount_options(mnt_context_get_fs(cxt)); > > if (!mnt_context_is_lazy(cxt)) { > @@ -263,6 +269,12 @@ static int umount_main(struct libmnt_context *cxt, int argc, char **argv) > } > ret = EX_SUCCESS; > err: > + if (verbose) { > + if (ret == EX_SUCCESS) > + printf(_("%s: umounted\n"), spec); > + else > + printf(_("%s: umount failed\n"), spec); > + } > free(opts); > return ret; > } > -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/utils/mount/mount_libmount.c b/utils/mount/mount_libmount.c index 6f85dc9..fa46d54 100644 --- a/utils/mount/mount_libmount.c +++ b/utils/mount/mount_libmount.c @@ -174,7 +174,7 @@ static int umount_main(struct libmnt_context *cxt, int argc, char **argv) { int rc, c; char *spec = NULL, *opts = NULL; - int ret = EX_FAIL; + int ret = EX_FAIL, verbose = 0; static const struct option longopts[] = { { "force", 0, 0, 'f' }, @@ -201,6 +201,8 @@ static int umount_main(struct libmnt_context *cxt, int argc, char **argv) return EX_USAGE; } + verbose = mnt_context_is_verbose(cxt); + if (optind < argc) spec = argv[optind++]; @@ -228,6 +230,10 @@ static int umount_main(struct libmnt_context *cxt, int argc, char **argv) goto err; } + if (verbose) + printf(_("%s: %s mount point detected\n"), spec, + mnt_context_get_fstype(cxt)); + opts = retrieve_mount_options(mnt_context_get_fs(cxt)); if (!mnt_context_is_lazy(cxt)) { @@ -263,6 +269,12 @@ static int umount_main(struct libmnt_context *cxt, int argc, char **argv) } ret = EX_SUCCESS; err: + if (verbose) { + if (ret == EX_SUCCESS) + printf(_("%s: umounted\n"), spec); + else + printf(_("%s: umount failed\n"), spec); + } free(opts); return ret; }
Let's print verbose messages like original non-libmount version. Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=923582 Signed-off-by: Karel Zak <kzak@redhat.com> --- utils/mount/mount_libmount.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)