system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-06 16:21:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

mount-tool,man: reword comments and error messages

Browse source 
We were consistenly using --umount everywhere, but add a comment to make this
clearer. Also, reword a few things for clarity.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2023-08-21 11:49:14 +02:00
parent 252adedaaf
commit 52a1e91e96
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
man/systemd-mount.xml
View file

@ -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>--automount=</option> option is implied, see below). If the option <option>--tmpfs</option>
is specified, then the argument will be interpreted as the path where the new temporary file system will
be mounted on.</para>
(i.e. the <option>--automount=</option> option is implied, see below). If the option
<option>--tmpfs</option> is specified, then the argument is interpreted as the path where the new
temporary file system shall be mounted.</para>
<para>If two arguments are specified, the first indicates the mount source (the
<replaceable>WHAT</replaceable>) and the second indicates the path to mount it on (the

4
src/mount/mount-tool.c
View file

@ -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) {