From: Zbigniew Jędrzejewski-Szmek Date: Mon, 21 Aug 2023 09:49:14 +0000 (+0200) Subject: mount-tool,man: reword comments and error messages X-Git-Tag: v255-rc1~646^2~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=52a1e91e96c8ad18deebf651bbf21ebf72f6a9ca;p=thirdparty%2Fsystemd.git mount-tool,man: reword comments and error messages We were consistenly using --umount everywhere, but add a comment to make this clearer. Also, reword a few things for clarity. --- diff --git a/man/systemd-mount.xml b/man/systemd-mount.xml index 890c950cd05..3463a107dab 100644 --- a/man/systemd-mount.xml +++ b/man/systemd-mount.xml @@ -70,9 +70,9 @@ whose name is generated from the file system label. In this mode the block device or image file must exist at the time of invocation of the command, so that it may be probed. If the device is found to be a removable block device (e.g. a USB stick), an automount point is created instead of a regular mount point - (i.e. the option is implied, see below). If the option - is specified, then the argument will be interpreted as the path where the new temporary file system will - be mounted on. + (i.e. the option is implied, see below). If the option + is specified, then the argument is interpreted as the path where the new + temporary file system shall be mounted. If two arguments are specified, the first indicates the mount source (the WHAT) and the second indicates the path to mount it on (the diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c index 31abc0685dc..a0f1503f70d 100644 --- a/src/mount/mount-tool.c +++ b/src/mount/mount-tool.c @@ -206,7 +206,7 @@ static int parse_argv(int argc, char *argv[]) { { "bind-device", no_argument, NULL, ARG_BIND_DEVICE }, { "list", no_argument, NULL, ARG_LIST }, { "umount", no_argument, NULL, 'u' }, - { "unmount", no_argument, NULL, 'u' }, + { "unmount", no_argument, NULL, 'u' }, /* Compat spelling */ { "collect", no_argument, NULL, 'G' }, { "tmpfs", no_argument, NULL, 'T' }, {}, @@ -407,7 +407,7 @@ static int parse_argv(int argc, char *argv[]) { if (argc > optind+2) return log_error_errno(SYNTHETIC_ERRNO(EINVAL), - "At most two arguments required."); + "More than two arguments are not allowed."); if (arg_tmpfs) { if (argc <= optind+1) {