c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-03-14 06:16:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

Replace bashisms in ZFS shell function stub.

Browse Source 
The `type` command is an optional feature in POSIX, so shouldn't be
used.

Instead, use `command -v`, which commit
  e865e7809e
did, but it missed this file.

Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Rob Norris <robn@despairlabs.com>
Signed-off-by: Turbo Fredriksson <turbo@bayour.com>
Closes #18000
This commit is contained in:
Turbo Fredriksson 2025-12-12 21:04:33 +00:00 committed by Brian Behlendorf
parent 1842d6b3cb
commit 6c6a469bea
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
etc/zfs/zfs-functions.in
View File

@ -26,13 +26,13 @@ fi
# Of course the functions we need are called differently # Of course the functions we need are called differently
# on different distributions - it would be way too easy # on different distributions - it would be way too easy
# otherwise!! # otherwise!!
if type log_failure_msg > /dev/null 2>&1 ; then if command -v log_failure_msg > /dev/null 2>&1 ; then
# LSB functions - fall through # LSB functions - fall through
zfs_log_begin_msg() { log_begin_msg "$1"; } zfs_log_begin_msg() { log_begin_msg "$1"; }
zfs_log_end_msg() { log_end_msg "$1"; } zfs_log_end_msg() { log_end_msg "$1"; }
zfs_log_failure_msg() { log_failure_msg "$1"; } zfs_log_failure_msg() { log_failure_msg "$1"; }
zfs_log_progress_msg() { log_progress_msg "$1"; } zfs_log_progress_msg() { log_progress_msg "$1"; }
elif type success > /dev/null 2>&1 ; then elif command -v success > /dev/null 2>&1 ; then
# Fedora/RedHat functions # Fedora/RedHat functions
zfs_set_ifs() { zfs_set_ifs() {
# For some reason, the init function library have a problem # For some reason, the init function library have a problem
@ -64,7 +64,7 @@ elif type success > /dev/null 2>&1 ; then
zfs_set_ifs "$TMP_IFS" zfs_set_ifs "$TMP_IFS"
} }
zfs_log_progress_msg() { printf "%s" "$""$1"; } zfs_log_progress_msg() { printf "%s" "$""$1"; }
elif type einfo > /dev/null 2>&1 ; then elif command -v einfo > /dev/null 2>&1 ; then
# Gentoo functions # Gentoo functions
zfs_log_begin_msg() { ebegin "$1"; } zfs_log_begin_msg() { ebegin "$1"; }
zfs_log_end_msg() { eend "$1"; } zfs_log_end_msg() { eend "$1"; }
@ -140,7 +140,7 @@ zfs_daemon_start()
local PIDFILE="$1"; shift local PIDFILE="$1"; shift
local DAEMON_BIN="$1"; shift local DAEMON_BIN="$1"; shift
if type start-stop-daemon > /dev/null 2>&1 ; then if command -v start-stop-daemon > /dev/null 2>&1 ; then
# LSB functions # LSB functions
start-stop-daemon --start --quiet --pidfile "$PIDFILE" \ start-stop-daemon --start --quiet --pidfile "$PIDFILE" \
--exec "$DAEMON_BIN" --test > /dev/null || return 1 --exec "$DAEMON_BIN" --test > /dev/null || return 1
@ -157,7 +157,7 @@ zfs_daemon_start()
then then
ln -sf "$PIDFILE" /run/sendsigs.omit.d/zed ln -sf "$PIDFILE" /run/sendsigs.omit.d/zed
fi fi
elif type daemon > /dev/null 2>&1 ; then elif command -v daemon > /dev/null 2>&1 ; then
# Fedora/RedHat functions # Fedora/RedHat functions
# shellcheck disable=SC2086 # shellcheck disable=SC2086
daemon --pidfile "$PIDFILE" "$DAEMON_BIN" "$@" daemon --pidfile "$PIDFILE" "$DAEMON_BIN" "$@"
@ -182,7 +182,7 @@ zfs_daemon_stop()
local DAEMON_BIN="$2" local DAEMON_BIN="$2"
local DAEMON_NAME="$3" local DAEMON_NAME="$3"
if type start-stop-daemon > /dev/null 2>&1 ; then if command -v start-stop-daemon > /dev/null 2>&1 ; then
# LSB functions # LSB functions
start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 \ start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 \
--pidfile "$PIDFILE" --name "$DAEMON_NAME" --pidfile "$PIDFILE" --name "$DAEMON_NAME"
@ -190,7 +190,7 @@ zfs_daemon_stop()
[ "$ret" = 0 ] && rm -f "$PIDFILE" [ "$ret" = 0 ] && rm -f "$PIDFILE"
return "$ret" return "$ret"
elif type killproc > /dev/null 2>&1 ; then elif command -v killproc > /dev/null 2>&1 ; then
# Fedora/RedHat functions # Fedora/RedHat functions
killproc -p "$PIDFILE" "$DAEMON_NAME" killproc -p "$PIDFILE" "$DAEMON_NAME"
ret="$?" ret="$?"
@ -212,11 +212,11 @@ zfs_daemon_status()
local DAEMON_BIN="$2" local DAEMON_BIN="$2"
local DAEMON_NAME="$3" local DAEMON_NAME="$3"
if type status_of_proc > /dev/null 2>&1 ; then if command -v status_of_proc > /dev/null 2>&1 ; then
# LSB functions # LSB functions
status_of_proc "$DAEMON_NAME" "$DAEMON_BIN" status_of_proc "$DAEMON_NAME" "$DAEMON_BIN"
return $? return $?
elif type status > /dev/null 2>&1 ; then elif command -v status > /dev/null 2>&1 ; then
# Fedora/RedHat functions # Fedora/RedHat functions
status -p "$PIDFILE" "$DAEMON_NAME" status -p "$PIDFILE" "$DAEMON_NAME"
return $? return $?
@ -233,12 +233,12 @@ zfs_daemon_reload()
local PIDFILE="$1" local PIDFILE="$1"
local DAEMON_NAME="$2" local DAEMON_NAME="$2"
if type start-stop-daemon > /dev/null 2>&1 ; then if command -v start-stop-daemon > /dev/null 2>&1 ; then
# LSB functions # LSB functions
start-stop-daemon --stop --signal 1 --quiet \ start-stop-daemon --stop --signal 1 --quiet \
--pidfile "$PIDFILE" --name "$DAEMON_NAME" --pidfile "$PIDFILE" --name "$DAEMON_NAME"
return $? return $?
elif type killproc > /dev/null 2>&1 ; then elif command -v killproc > /dev/null 2>&1 ; then
# Fedora/RedHat functions # Fedora/RedHat functions
killproc -p "$PIDFILE" "$DAEMON_NAME" -HUP killproc -p "$PIDFILE" "$DAEMON_NAME" -HUP
return $? return $?