mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-24 11:18:52 +03:00
d/zfsutils.zfs.init derivatives: shellcheck, fix header
Reviewed-by: John Kennedy <john.kennedy@delphix.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz> Closes #12042
This commit is contained in:
наб
@@ -26,10 +26,8 @@
|
||||
#
|
||||
# Released under the 2-clause BSD license.
|
||||
#
|
||||
# The original script that acted as a template for this script came from
|
||||
# the Debian GNU/Linux kFreeBSD ZFS packages (which did not include a
|
||||
# licensing stansa) in the commit dated Mar 24, 2011:
|
||||
# https://github.com/zfsonlinux/pkg-zfs/commit/80a3ae582b59c0250d7912ba794dca9e669e605a
|
||||
# This script is based on debian/zfsutils.zfs.init from the
|
||||
# Debian GNU/kFreeBSD zfsutils 8.1-3 package, written by Aurelien Jarno.
|
||||
|
||||
# Source the common init script
|
||||
. @sysconfdir@/zfs/zfs-functions
|
||||
@@ -56,16 +54,13 @@ do_verbatim_import()
|
||||
# Support function to get a list of all pools, separated with ';'
|
||||
find_pools()
|
||||
{
|
||||
local CMD="$*"
|
||||
local pools
|
||||
|
||||
pools=$($CMD 2> /dev/null | \
|
||||
pools=$("$@" 2> /dev/null | \
|
||||
grep -E "pool:|^[a-zA-Z0-9]" | \
|
||||
sed 's@.*: @@' | \
|
||||
sort | \
|
||||
while read pool; do \
|
||||
echo -n "$pool;"
|
||||
done)
|
||||
tr '\n' ';')
|
||||
|
||||
echo "${pools%%;}" # Return without the last ';'.
|
||||
}
|
||||
@@ -80,7 +75,7 @@ do_import_all_visible()
|
||||
[ -n "$init" ] && rm -f /etc/dfs/sharetab
|
||||
|
||||
# Just simplify code later on.
|
||||
if [ -n "$USE_DISK_BY_ID" -a "$USE_DISK_BY_ID" != 'yes' ]
|
||||
if [ -n "$USE_DISK_BY_ID" ] && [ "$USE_DISK_BY_ID" != 'yes' ]
|
||||
then
|
||||
# It's something, but not 'yes' so it's no good to us.
|
||||
unset USE_DISK_BY_ID
|
||||
@@ -153,7 +148,7 @@ do_import_all_visible()
|
||||
# to something we can use later with the real import(s). We want to
|
||||
# make sure we find all by* dirs, BUT by-vdev should be first (if it
|
||||
# exists).
|
||||
if [ -n "$USE_DISK_BY_ID" -a -z "$ZPOOL_IMPORT_PATH" ]
|
||||
if [ -n "$USE_DISK_BY_ID" ] && [ -z "$ZPOOL_IMPORT_PATH" ]
|
||||
then
|
||||
local dirs
|
||||
dirs="$(for dir in $(echo /dev/disk/by-*)
|
||||
@@ -231,7 +226,7 @@ do_import_all_visible()
|
||||
# using the cache file soon and that might succeed.
|
||||
[ ! -f "$ZPOOL_CACHE" ] && zfs_log_end_msg "$RET"
|
||||
|
||||
if [ "$r" -gt 0 -a -f "$ZPOOL_CACHE" ]
|
||||
if [ "$r" -gt 0 ] && [ -f "$ZPOOL_CACHE" ]
|
||||
then
|
||||
# Failed to import without a cache file. Try WITH...
|
||||
if [ -z "$init" ] && check_boolean "$VERBOSE_MOUNT"
|
||||
@@ -254,7 +249,7 @@ do_import_all_visible()
|
||||
[ -n "$init" ] && zfs_log_end_msg "$RET"
|
||||
|
||||
IFS="$OLD_IFS"
|
||||
[ -n "$already_imported" -a -z "$available_pools" ] && return 0
|
||||
[ -n "$already_imported" ] && [ -z "$available_pools" ] && return 0
|
||||
|
||||
return "$RET"
|
||||
}
|
||||
|
||||
@@ -23,10 +23,8 @@
|
||||
#
|
||||
# Released under the 2-clause BSD license.
|
||||
#
|
||||
# The original script that acted as a template for this script came from
|
||||
# the Debian GNU/Linux kFreeBSD ZFS packages (which did not include a
|
||||
# licensing stansa) in the commit dated Mar 24, 2011:
|
||||
# https://github.com/zfsonlinux/pkg-zfs/commit/80a3ae582b59c0250d7912ba794dca9e669e605a
|
||||
# This script is based on debian/zfsutils.zfs.init from the
|
||||
# Debian GNU/kFreeBSD zfsutils 8.1-3 package, written by Aurelien Jarno.
|
||||
|
||||
# Source the common init script
|
||||
. @sysconfdir@/zfs/zfs-functions
|
||||
@@ -34,9 +32,8 @@
|
||||
# ----------------------------------------------------
|
||||
|
||||
chkroot() {
|
||||
while read line; do
|
||||
set -- $line
|
||||
if [ "$2" = "/" ]; then
|
||||
while read -r _ mp _; do
|
||||
if [ "$mp" = "/" ]; then
|
||||
return 0
|
||||
fi
|
||||
done < /proc/self/mounts
|
||||
@@ -65,7 +62,7 @@ do_depend()
|
||||
# Mount all datasets/filesystems
|
||||
do_mount()
|
||||
{
|
||||
local verbose overlay i mntpt val
|
||||
local verbose overlay i mntpt
|
||||
|
||||
check_boolean "$VERBOSE_MOUNT" && verbose=v
|
||||
check_boolean "$DO_OVERLAY_MOUNTS" && overlay=O
|
||||
@@ -83,7 +80,7 @@ do_mount()
|
||||
|
||||
read_mtab "^/dev/(zd|zvol)"
|
||||
read_fstab "^/dev/(zd|zvol)"
|
||||
i=0; var=$(eval echo FSTAB_$i)
|
||||
i=0; var=$(eval echo "FSTAB_$i")
|
||||
while [ -n "$(eval echo "$""$var")" ]
|
||||
do
|
||||
mntpt=$(eval echo "$""$var")
|
||||
|
||||
@@ -22,10 +22,8 @@
|
||||
#
|
||||
# Released under the 2-clause BSD license.
|
||||
#
|
||||
# The original script that acted as a template for this script came from
|
||||
# the Debian GNU/Linux kFreeBSD ZFS packages (which did not include a
|
||||
# licensing stansa) in the commit dated Mar 24, 2011:
|
||||
# https://github.com/zfsonlinux/pkg-zfs/commit/80a3ae582b59c0250d7912ba794dca9e669e605a
|
||||
# This script is based on debian/zfsutils.zfs.init from the
|
||||
# Debian GNU/kFreeBSD zfsutils 8.1-3 package, written by Aurelien Jarno.
|
||||
|
||||
# Source the common init script
|
||||
. @sysconfdir@/zfs/zfs-functions
|
||||
|
||||
@@ -21,10 +21,8 @@
|
||||
#
|
||||
# Released under the 2-clause BSD license.
|
||||
#
|
||||
# The original script that acted as a template for this script came from
|
||||
# the Debian GNU/Linux kFreeBSD ZFS packages (which did not include a
|
||||
# licensing stansa) in the commit dated Mar 24, 2011:
|
||||
# https://github.com/zfsonlinux/pkg-zfs/commit/80a3ae582b59c0250d7912ba794dca9e669e605a
|
||||
# This script is based on debian/zfsutils.zfs.init from the
|
||||
# Debian GNU/kFreeBSD zfsutils 8.1-3 package, written by Aurelien Jarno.
|
||||
|
||||
# Source the common init script
|
||||
. @sysconfdir@/zfs/zfs-functions
|
||||
@@ -57,7 +55,7 @@ do_start()
|
||||
|
||||
do_stop()
|
||||
{
|
||||
local pools RET
|
||||
local pools
|
||||
check_module_loaded "zfs" || exit 0
|
||||
|
||||
zfs_action "Stopping ZFS Event Daemon" zfs_daemon_stop \
|
||||
|
||||
Reference in New Issue
Block a user