X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fnfs-common.init;h=b6fb962e8692b4125c475afe510cc11938e936b6;hp=c46e832a3c58442b0ff964bff4991bb9aadf76f2;hb=e36b61ba46d34841a6ad99857c7cc43fc8c1ee89;hpb=e06694ca075bc26870d3504dddda814f56a61a81 diff --git a/debian/nfs-common.init b/debian/nfs-common.init index c46e832..b6fb962 100755 --- a/debian/nfs-common.init +++ b/debian/nfs-common.init @@ -52,25 +52,25 @@ esac # Exit if required binaries are missing. [ -x $PREFIX/sbin/rpc.statd ] || exit 0 -[ -x $PREFIX/sbin/rpc.lockd ] || [ "$NEED_LOCKD" = no ] || exit 0 -[ -x /usr/sbin/rpc.idmapd ] || [ "$NEED_IDMAPD" = no ] || exit 0 -[ -x /usr/sbin/rpc.gssd ] || [ "$NEED_GSSD" = no ] || exit 0 +[ -x $PREFIX/sbin/rpc.lockd ] || [ "$NEED_LOCKD" = no ] || exit 0 +[ -x /usr/sbin/rpc.idmapd ] || [ "$NEED_IDMAPD" = no ] || exit 0 +[ -x /usr/sbin/rpc.gssd ] || [ "$NEED_GSSD" = no ] || exit 0 do_modprobe() { - modprobe -q $1 || true + modprobe -q "$1" || true } do_mount() { - if ! grep -E -qs "$1\$" /proc/filesystems - then - return 1 - fi - if ! mountpoint -q $2 - then - mount -t $1 $3 $1 $2 - return - fi - return 0 + if ! grep -E -qs "$1\$" /proc/filesystems + then + return 1 + fi + if ! mountpoint -q "$2" + then + mount -t "$1" "$1" "$2" + return + fi + return 0 } # See how we were called. @@ -90,7 +90,7 @@ case "$1" in if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ] then do_modprobe nfs - if do_mount rpc_pipefs $PIPEFS_MOUNTPOINT; + if do_mount rpc_pipefs $PIPEFS_MOUNTPOINT then if [ "$NEED_IDMAPD" = yes ] then