Skip to content

Commit

Permalink
Quote variables in the zfs.lsb script.
Browse files Browse the repository at this point in the history
For consistency and safety, quote all variables in the zfs.lsb script.
This protects in the unlikely case that any of the file names contain
whitespace.

Signed-off-by: Brian Behlendorf <[email protected]>
Issue openzfs#439
  • Loading branch information
dajhorn authored and behlendorf committed Dec 5, 2011
1 parent c2d9c41 commit 660cbad
Showing 1 changed file with 16 additions and 16 deletions.
32 changes: 16 additions & 16 deletions etc/init.d/zfs.lsb.in
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ ZPOOL="@sbindir@/zpool"
ZPOOL_CACHE="@sysconfdir@/zfs/zpool.cache"

# Source zfs configuration.
[ -r /etc/default/zfs ] && . /etc/default/zfs
[ -r '/etc/default/zfs' ] && . /etc/default/zfs

[ -x $ZPOOL ] || exit 1
[ -x $ZFS ] || exit 2
[ -x "$ZPOOL" ] || exit 1
[ -x "$ZFS" ] || exit 2

start()
{
[ -f $LOCKFILE ] && return 3
[ -f "$LOCKFILE" ] && return 3

# Requires selinux policy which has not been written.
if [ -r "/selinux/enforce" ] &&
Expand All @@ -58,45 +58,45 @@ start()
# This should be handled by rc.sysinit but lets be paranoid.
awk '$2 == "/" { exit 1 }' /etc/mtab
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
if [ "$RETVAL" -eq 0 ]; then
/bin/mount -f /
fi

# Import all pools described by the cache file, and then mount
# all filesystem based on their properties.
if [ -f $ZPOOL_CACHE ] ; then
if [ -f "$ZPOOL_CACHE" ] ; then
log_begin_msg "Importing ZFS pools"
$ZPOOL import -c $ZPOOL_CACHE -aN 2>/dev/null
"$ZPOOL" import -c "$ZPOOL_CACHE" -aN 2>/dev/null
log_end_msg $?

log_begin_msg "Mounting ZFS filesystems"
$ZFS mount -a
"$ZFS" mount -a
log_end_msg $?

log_begin_msg "Exporting ZFS filesystems"
$ZFS share -a
"$ZFS" share -a
log_end_msg $?
fi

touch $LOCKFILE
touch "$LOCKFILE"
}

stop()
{
[ ! -f $LOCKFILE ] && return 3
[ ! -f "$LOCKFILE" ] && return 3

log_begin_msg "Unmounting ZFS filesystems"
$ZFS umount -a
"$ZFS" umount -a
log_end_msg $?

rm -f $LOCKFILE
rm -f "$LOCKFILE"
}

status()
{
[ ! -f $LOCKFILE ] && return 3
[ ! -f "$LOCKFILE" ] && return 3

$ZPOOL status && echo && $ZPOOL list
"$ZPOOL" status && echo "" && "$ZPOOL" list
}

case "$1" in
Expand All @@ -117,7 +117,7 @@ case "$1" in
start
;;
condrestart)
if [ -f $LOCKFILE ]; then
if [ -f "$LOCKFILE" ]; then
stop
start
fi
Expand Down

0 comments on commit 660cbad

Please sign in to comment.