From 5c61a7d623349e92b1b167ebeda338290df7451a Mon Sep 17 00:00:00 2001
From: "Adrian C. (anrxc)" <anrxc@sysphere.org>
Date: Sat, 29 Jun 2013 19:59:38 +0200
Subject: rcdscripts: autofs, bluez, nfs-utils and ppp sbin deprecation

---
 src/autofs/autofs        | 2 +-
 src/bluez/rc.bluetooth   | 2 +-
 src/nfs-utils/nfs-common | 2 +-
 src/nfs-utils/nfs-server | 2 +-
 src/ppp/ppp              | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/autofs/autofs b/src/autofs/autofs
index 08bd3e1..245b1b4 100755
--- a/src/autofs/autofs
+++ b/src/autofs/autofs
@@ -16,7 +16,7 @@ PID=`cat /var/run/autofs-running 2> /dev/null`
 case "$1" in
   start)
     stat_busy "Starting $daemon_name daemon"
-    [ -z "$PID" ] && /usr/sbin/automount $daemonoptions &> /dev/null
+    [ -z "$PID" ] && /usr/bin/automount $daemonoptions &> /dev/null
     if [ $? -gt 0 ]; then
       stat_fail
     else
diff --git a/src/bluez/rc.bluetooth b/src/bluez/rc.bluetooth
index 0feeaea..78e0f44 100755
--- a/src/bluez/rc.bluetooth
+++ b/src/bluez/rc.bluetooth
@@ -12,7 +12,7 @@ RFCOMM_NAME="rfcomm"
 PAND_NAME="pand"
 DUND_NAME="dund"
 
-DAEMON_EXEC="/usr/sbin/bluetoothd"
+DAEMON_EXEC="/usr/bin/bluetoothd"
 HIDD_EXEC="/usr/bin/hidd"
 RFCOMM_EXEC="/usr/bin/rfcomm"
 PAND_EXEC="/usr/bin/pand"
diff --git a/src/nfs-utils/nfs-common b/src/nfs-utils/nfs-common
index 9b8ee2d..34dd4c3 100755
--- a/src/nfs-utils/nfs-common
+++ b/src/nfs-utils/nfs-common
@@ -89,7 +89,7 @@ case "$NEED_GSSD" in
 esac
 
 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
 }
diff --git a/src/nfs-utils/nfs-server b/src/nfs-utils/nfs-server
index a8e4898..8764660 100755
--- a/src/nfs-utils/nfs-server
+++ b/src/nfs-utils/nfs-server
@@ -50,7 +50,7 @@ case "$NEED_SVCGSSD" in
 esac
 
 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
 }
diff --git a/src/ppp/ppp b/src/ppp/ppp
index 16e01ba..7b2ab12 100755
--- a/src/ppp/ppp
+++ b/src/ppp/ppp
@@ -3,7 +3,7 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-PID=`pidof -o %PPID /usr/sbin/pppd`
+PID=`pidof -o %PPID /usr/bin/pppd`
 case "$1" in
   start)
     stat_busy "Starting PPP daemon"
-- 
cgit v1.2.3