Minor documentation, logging, and testing typos

This patch collects some minor inconsistencies and typos in the
documentation, logging and testing infrastructure.

Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Antonio Russo <antonio.e.russo@gmail.com>
Closes #7608
This commit is contained in:
Antonio Russo 2018-06-07 12:38:39 -04:00 committed by Brian Behlendorf
parent b405837a6c
commit 7106b23640
3 changed files with 15 additions and 16 deletions

View File

@ -29,7 +29,7 @@ FSLIST="@sysconfdir@/zfs/zfs-list.cache"
[ -d "${FSLIST}" ] || exit 0
do_fail() {
printf 'zfs-mount-generator.sh: %s\n' "$*" > /dev/kmsg
printf 'zfs-mount-generator: %s\n' "$*" > /dev/kmsg
exit 1
}
@ -103,13 +103,13 @@ process_line() {
elif [ "${p_relatime}" = off ] ; then
opts="${opts},atime,strictatime"
else
printf 'zfs-mount-generator.sh: (%s) invalid relatime\n' \
printf 'zfs-mount-generator: (%s) invalid relatime\n' \
"${dataset}" >/dev/kmsg
fi
elif [ "${p_atime}" = off ] ; then
opts="${opts},noatime"
else
printf 'zfs-mount-generator.sh: (%s) invalid atime\n' \
printf 'zfs-mount-generator: (%s) invalid atime\n' \
"${dataset}" >/dev/kmsg
fi
@ -119,7 +119,7 @@ process_line() {
elif [ "${p_devices}" = off ] ; then
opts="${opts},nodev"
else
printf 'zfs-mount-generator.sh: (%s) invalid devices\n' \
printf 'zfs-mount-generator: (%s) invalid devices\n' \
"${dataset}" >/dev/kmsg
fi
@ -129,7 +129,7 @@ process_line() {
elif [ "${p_exec}" = off ] ; then
opts="${opts},noexec"
else
printf 'zfs-mount-generator.sh: (%s) invalid exec\n' \
printf 'zfs-mount-generator: (%s) invalid exec\n' \
"${dataset}" >/dev/kmsg
fi
@ -139,7 +139,7 @@ process_line() {
elif [ "${p_readonly}" = off ] ; then
opts="${opts},rw"
else
printf 'zfs-mount-generator.sh: (%s) invalid readonly\n' \
printf 'zfs-mount-generator: (%s) invalid readonly\n' \
"${dataset}" >/dev/kmsg
fi
@ -149,7 +149,7 @@ process_line() {
elif [ "${p_setuid}" = off ] ; then
opts="${opts},nosuid"
else
printf 'zfs-mount-generator.sh: (%s) invalid setuid\n' \
printf 'zfs-mount-generator: (%s) invalid setuid\n' \
"${dataset}" >/dev/kmsg
fi
@ -159,13 +159,13 @@ process_line() {
elif [ "${p_nbmand}" = off ] ; then
opts="${opts},nomand"
else
printf 'zfs-mount-generator.sh: (%s) invalid nbmand\n' \
printf 'zfs-mount-generator: (%s) invalid nbmand\n' \
"${dataset}" >/dev/kmsg
fi
# If the mountpoint has already been created, give it precedence.
if [ -e "${dest_norm}/${mountfile}" ] ; then
printf 'zfs-mount-generator.sh: %s already exists\n' "${mountfile}" \
printf 'zfs-mount-generator: %s already exists\n' "${mountfile}" \
>/dev/kmsg
return
fi

View File

@ -1444,9 +1444,9 @@ Controls where the user's encryption key will be loaded from by default for
commands such as
.Nm zfs Cm load-key
and
.Nm zfs Cm mount Cm -l . This property is
only set for encrypted datasets which are encryption roots. If unspecified, the
default is
.Nm zfs Cm mount Cm -l .
This property is only set for encrypted datasets which are encryption roots. If
unspecified, the default is
.Sy prompt.
.Pp
Even though the encryption suite cannot be changed after dataset creation, the
@ -2799,9 +2799,8 @@ property is
.Po the default is
.Sy off
.Pc .
The following fields are displayed,
.Sy name Ns \&, Ns Sy used Ns \&, Ns Sy available Ns \&, Ns Sy referenced Ns \&, Ns
.Sy mountpoint .
The following fields are displayed:
.Sy name Ns \&, Sy used Ns \&, Sy available Ns \&, Sy referenced Ns \&, Sy mountpoint Ns .
.Bl -tag -width "-H"
.It Fl H
Used for scripting mode.

View File

@ -1,4 +1,4 @@
#!/usr/bin/ksh
#!/bin/ksh
#
# This file and its contents are supplied under the terms of the