diff options
| author | Britney Fransen <brfransen@gmail.com> | 2014-04-15 20:38:18 (GMT) |
|---|---|---|
| committer | Britney Fransen <brfransen@gmail.com> | 2014-04-15 20:38:18 (GMT) |
| commit | 237df8ca287f8109dad86a73072853fd8d7670ff (patch) | |
| tree | 3cf532283cc93d13f3b2155a72c29334b7f853b3 /abs/core/runit-scripts/runitscripts/services/nfs-common | |
| parent | 7c996d3dbc7f8609f7dedbf0928305930d86c9cf (diff) | |
| download | linhes_pkgbuild-237df8ca287f8109dad86a73072853fd8d7670ff.zip linhes_pkgbuild-237df8ca287f8109dad86a73072853fd8d7670ff.tar.gz linhes_pkgbuild-237df8ca287f8109dad86a73072853fd8d7670ff.tar.bz2 | |
runit-scripts: update /sbin dirs to /usr/bin. refs #961
Diffstat (limited to 'abs/core/runit-scripts/runitscripts/services/nfs-common')
| -rwxr-xr-x | abs/core/runit-scripts/runitscripts/services/nfs-common/finish | 9 | ||||
| -rwxr-xr-x | abs/core/runit-scripts/runitscripts/services/nfs-common/run | 16 |
2 files changed, 12 insertions, 13 deletions
diff --git a/abs/core/runit-scripts/runitscripts/services/nfs-common/finish b/abs/core/runit-scripts/runitscripts/services/nfs-common/finish index 531192d..fddac0c 100755 --- a/abs/core/runit-scripts/runitscripts/services/nfs-common/finish +++ b/abs/core/runit-scripts/runitscripts/services/nfs-common/finish @@ -5,19 +5,19 @@ daemon_name=nfs-common . /etc/rc.conf . /etc/rc.d/functions . /etc/conf.d/$daemon_name.conf - + # rpc.statd daemon & binary location STATD_DAEMON_NAME=rpc.statd -STATD="/usr/sbin/rpc.statd" +STATD="/usr/bin/rpc.statd" # rpc.idmapd daemon & binary location IDMAPD_DAEMON_NAME=rpc.idmapd -IDMAPD="/usr/sbin/rpc.idmapd" +IDMAPD="/usr/bin/rpc.idmapd" # rpc.gssd daemon & binary location GSSD_DAEMON_NAME=rpc.gssd -GSSD="/usr/sbin/rpc.gssd" +GSSD="/usr/bin/rpc.gssd" do_umount() { if mountpoint -q "$1" ; then @@ -29,7 +29,6 @@ do_umount() { get_pid() { pidof -o %PPID "$1" } - stat_runit "Stopping $GSSD_DAEMON_NAME daemon" PID=$(get_pid $GSSD) diff --git a/abs/core/runit-scripts/runitscripts/services/nfs-common/run b/abs/core/runit-scripts/runitscripts/services/nfs-common/run index f0dbb6e..10532ac 100755 --- a/abs/core/runit-scripts/runitscripts/services/nfs-common/run +++ b/abs/core/runit-scripts/runitscripts/services/nfs-common/run @@ -9,15 +9,15 @@ daemon_name=nfs-common # rpc.statd daemon & binary location STATD_DAEMON_NAME=rpc.statd -STATD="/usr/sbin/rpc.statd" +STATD="/usr/bin/rpc.statd" # rpc.idmapd daemon & binary location IDMAPD_DAEMON_NAME=rpc.idmapd -IDMAPD="/usr/sbin/rpc.idmapd" +IDMAPD="/usr/bin/rpc.idmapd" # rpc.gssd daemon & binary location GSSD_DAEMON_NAME=rpc.gssd -GSSD="/usr/sbin/rpc.gssd" +GSSD="/usr/bin/rpc.gssd" # Default mountpoint and options for rpc_pipefs filesystem @@ -27,7 +27,7 @@ GSSD="/usr/sbin/rpc.gssd" do_modprobe() { - if [ -x /sbin/modprobe -a -f /proc/modules ]; then + if [ -x /usr/bin/modprobe -a -f /proc/modules ]; then modprobe -q "$1" || true fi } @@ -36,7 +36,7 @@ do_mount() { if ! grep -E "$1\$" /proc/filesystems &> /dev/null ; then return 1 fi - + if grep -vw "$1" /proc/mounts &> /dev/null ; then if ! mountpoint -q "$2" ; then mount -t "$1" "$1" "$2" -o "$3" @@ -63,14 +63,14 @@ get_pid() { stat_runit "Starting NFS-common: $daemon_name" -svwaitup rpcbind >/dev/null 2>/dev/null +svwaitup rpcbind >/dev/null 2>/dev/null printhl " NFS-common: sm-notify" -/usr/sbin/sm-notify $SMNOTIFY_OPTS >/dev/null 2>/dev/null +/usr/bin/sm-notify $SMNOTIFY_OPTS >/dev/null 2>/dev/null do_modprobe sunrpc do_modprobe nfs do_modprobe nfsd -do_mount rpc_pipefs "$PIPEFS_MOUNTPOINT" "$PIPEFS_MOUNTOPTS" +do_mount rpc_pipefs "$PIPEFS_MOUNTPOINT" "$PIPEFS_MOUNTOPTS" printhl " NFS-common: $IDMAPD_DAEMON_NAME" |