From cfbaa3c830e34b1c8920a48fd5e7196287f674eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= Date: Tue, 10 Feb 2015 20:12:13 +0100 Subject: [PATCH] Use test(1) in a proper way Use the correct operators to check the expected data type. Signed-off-by: Soeren Tempel Signed-off-by: Brian Behlendorf Issue #3093 --- dracut/90zfs/mount-zfs.sh.in | 4 ++-- dracut/90zfs/parse-zfs.sh.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dracut/90zfs/mount-zfs.sh.in b/dracut/90zfs/mount-zfs.sh.in index 1fb4ea537ec9..ffc3f201350a 100755 --- a/dracut/90zfs/mount-zfs.sh.in +++ b/dracut/90zfs/mount-zfs.sh.in @@ -22,13 +22,13 @@ case "$root" in # Might be imported by the kernel module, so try searching before # we import anything. zfsbootfs=`zpool list -H -o bootfs | sed -n '/^-$/ !p' | sed 'q'` - if [ "$?" != "0" ] || [ "$zfsbootfs" = "" ] || \ + if [ $? -ne 0 ] || [ -z "$zfsbootfs" ] || \ [ "$zfsbootfs" = "no pools available" ] ; then # Not there, so we need to import everything. info "ZFS: Attempting to import additional pools." zpool import -N -a ${ZPOOL_FORCE} zfsbootfs=`zpool list -H -o bootfs | sed -n '/^-$/ !p' | sed 'q'` - if [ "$?" != "0" ] || [ "$zfsbootfs" = "" ] || \ + if [ $? -ne 0 ] || [ -z "$zfsbootfs" ] || \ [ "$zfsbootfs" = "no pools available" ] ; then rootok=0 pool="" diff --git a/dracut/90zfs/parse-zfs.sh.in b/dracut/90zfs/parse-zfs.sh.in index 571d263ce102..f945a27c1e93 100755 --- a/dracut/90zfs/parse-zfs.sh.in +++ b/dracut/90zfs/parse-zfs.sh.in @@ -52,7 +52,7 @@ esac # Make sure Dracut is happy that we have a root and will wait for ZFS # modules to settle before mounting. -if [ "${wait_for_zfs}" = "1" ]; then +if [ ${wait_for_zfs} -eq 1 ]; then ln -s /dev/null /dev/root 2>/dev/null echo '[ -e /dev/zfs ]' > $hookdir/initqueue/finished/zfs.sh fi