aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian C. (anrxc) <anrxc@sysphere.org>2013-06-01 14:13:56 (GMT)
committerAdrian C. (anrxc) <anrxc@sysphere.org>2013-06-01 14:13:56 (GMT)
commit84292d3d48e4ad04a8e8f25a51b43452bc1b385a (patch)
treeab215360f743f73dc5bd9a9f02dedb900a0e4d6f
parent7df973541b4c05949282109e43c4e2fd935b564d (diff)
downloadrcdscripts-84292d3d48e4ad04a8e8f25a51b43452bc1b385a.tar.xz
rcdscripts: nfs and iptables /usr/sbin deprecation2013.06.01
-rwxr-xr-xsrc/iptables/ip6tables4
-rwxr-xr-xsrc/iptables/iptables4
-rwxr-xr-xsrc/nfs-utils/nfs-common8
-rwxr-xr-xsrc/nfs-utils/nfs-server10
4 files changed, 13 insertions, 13 deletions
diff --git a/src/iptables/ip6tables b/src/iptables/ip6tables
index 2d119e3..0bda622 100755
--- a/src/iptables/ip6tables
+++ b/src/iptables/ip6tables
@@ -21,7 +21,7 @@ case "$1" in
echo 1 >/proc/sys/net/ipv6/conf/all/forwarding
fi
if ck_daemon ip6tables; then
- /usr/sbin/ip6tables-restore < $IP6TABLES_CONF
+ /usr/bin/ip6tables-restore < $IP6TABLES_CONF
if [ $? -gt 0 ]; then
stat_fail
else
@@ -56,7 +56,7 @@ case "$1" in
;;
save)
stat_busy "Saving IP6 Tables"
- /usr/sbin/ip6tables-save >$IP6TABLES_CONF
+ /usr/bin/ip6tables-save >$IP6TABLES_CONF
if [ $? -gt 0 ]; then
stat_fail
else
diff --git a/src/iptables/iptables b/src/iptables/iptables
index fbb02fa..9dbaf88 100755
--- a/src/iptables/iptables
+++ b/src/iptables/iptables
@@ -20,7 +20,7 @@ case "$1" in
echo 1 >/proc/sys/net/ipv4/ip_forward
fi
if ck_daemon iptables; then
- /usr/sbin/iptables-restore < $IPTABLES_CONF
+ /usr/bin/iptables-restore < $IPTABLES_CONF
if [ $? -gt 0 ]; then
stat_fail
else
@@ -55,7 +55,7 @@ case "$1" in
;;
save)
stat_busy "Saving IP Tables"
- /usr/sbin/iptables-save >$IPTABLES_CONF
+ /usr/bin/iptables-save >$IPTABLES_CONF
if [ $? -gt 0 ]; then
stat_fail
else
diff --git a/src/nfs-utils/nfs-common b/src/nfs-utils/nfs-common
index 7b16b4b..9b8ee2d 100755
--- a/src/nfs-utils/nfs-common
+++ b/src/nfs-utils/nfs-common
@@ -13,15 +13,15 @@ PIPEFS_MOUNTOPTS=
# 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"
. /etc/rc.conf
. /etc/rc.d/functions
@@ -144,7 +144,7 @@ case "$1" in
exit 1
fi
# Run sm-notify
- /usr/sbin/sm-notify $SMNOTIFY_OPTS
+ /usr/bin/sm-notify $SMNOTIFY_OPTS
fi
if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]; then
diff --git a/src/nfs-utils/nfs-server b/src/nfs-utils/nfs-server
index 6aa609d..a8e4898 100755
--- a/src/nfs-utils/nfs-server
+++ b/src/nfs-utils/nfs-server
@@ -13,22 +13,22 @@ PROCNFSD_MOUNTOPTS=
# rpc.nfsd daemon & binary location
NFSD_PROCESS_NAME=nfsd
NFSD_DAEMON_NAME=rpc.nfsd
-NFSD="/usr/sbin/rpc.nfsd"
+NFSD="/usr/bin/rpc.nfsd"
# rpc.svcgssd daemon & binary location
SVCGSSD_DAEMON_NAME=rpc.svcgssd
-SVCGSSD="/usr/sbin/rpc.svcgssd"
+SVCGSSD="/usr/bin/rpc.svcgssd"
# rpc.idmapd daemon & binary location
IDMAPD_DAEMON_NAME=rpc.idmapd
-IDMAPD="/usr/sbin/rpc.idmapd"
+IDMAPD="/usr/bin/rpc.idmapd"
# rpc.mountd daemon & binary location
MOUNTD_DAEMON_NAME=rpc.mountd
-MOUNTD="/usr/sbin/rpc.mountd"
+MOUNTD="/usr/bin/rpc.mountd"
# exortfs binary location
-EXPORTFS="/usr/sbin/exportfs"
+EXPORTFS="/usr/bin/exportfs"
. /etc/rc.conf
. /etc/rc.d/functions