Cosmetics and quoting.

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index c46e832a3c58442b0ff964bff4991bb9aadf76f2..b6fb962e8692b4125c475afe510cc11938e936b6 100755 (executable)
--- 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
 
 # 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() {
 
 do_modprobe() {

-       modprobe -q $1 || true
+    modprobe -q "$1" || true

 }
 
 do_mount() {
 }
 
 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.
 }
 
 # See how we were called.


@@ -90,7 +90,7 @@ case "$1" in
        if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]
        then
            do_modprobe nfs
        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
            then
                if [ "$NEED_IDMAPD" = yes ]
                then

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index 23215ecf9f046c69aaee1575bf5693b7b470034b..11ff438b46f26588b60bba2109a1cb158882b119 100755 (executable)
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -17,9 +17,9 @@ DESC="NFS kernel daemon"
 PREFIX=/usr
 
 # Exit if required binaries are missing.
 PREFIX=/usr
 
 # Exit if required binaries are missing.

-[ -x $PREFIX/sbin/rpc.nfsd ] || exit 0
-[ -x $PREFIX/sbin/rpc.mountd ] || exit 0
-[ -x $PREFIX/sbin/exportfs ] || exit 0
+[ -x $PREFIX/sbin/rpc.nfsd    ] || exit 0
+[ -x $PREFIX/sbin/rpc.mountd  ] || exit 0
+[ -x $PREFIX/sbin/exportfs    ] || exit 0

 [ -x $PREFIX/sbin/rpc.svcgssd ] || exit 0
 
 # Read config
 [ -x $PREFIX/sbin/rpc.svcgssd ] || exit 0
 
 # Read config


@@ -35,20 +35,20 @@ if [ -f $DEFAULTFILE ]; then
 fi
 
 do_modprobe() {
 fi
 
 do_modprobe() {

-       modprobe -q $1 || true
+    modprobe -q "$1" || true

 }
 
 do_mount() {
 }
 
 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.
 }
 
 # See how we were called.


@@ -70,7 +70,7 @@ case "$1" in
                    start-stop-daemon --start --quiet \
                            --make-pidfile --pidfile /var/run/rpc.svcgssd.pid \
                            --exec $PREFIX/sbin/rpc.svcgssd -- $RPCSVCGSSDOPTS
                    start-stop-daemon --start --quiet \
                            --make-pidfile --pidfile /var/run/rpc.svcgssd.pid \
                            --exec $PREFIX/sbin/rpc.svcgssd -- $RPCSVCGSSDOPTS

-               fi
+               fi

 
                printf " nfsd"
                start-stop-daemon --start --quiet \
 
                printf " nfsd"
                start-stop-daemon --start --quiet \