aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian C. (anrxc) <anrxc@sysphere.org>2013-05-25 20:15:39 (GMT)
committerAdrian C. (anrxc) <anrxc@sysphere.org>2013-05-25 20:15:39 (GMT)
commit57cd084ff2f96f001045a8849b68877e9db2f6d0 (patch)
tree6727a3351882b3ad62115ecac4f2d537e5e1731d
parent2bd6b7a88739f24b277bb41eb6e6325c8f97c181 (diff)
downloadrcdscripts-57cd084ff2f96f001045a8849b68877e9db2f6d0.tar.xz
rcdscripts: start deprecating /usr/sbin
The following scripts were found to be broken due to binaries being moved to /usr/bin: acpid, alsa, fancontrol, sensord, healthd, sshd, rfkill and syslog-ng. I do not doubt several more daemons were moved to /usr/bin already. But there are 230 services in this package and I can't test them all.
-rwxr-xr-xsrc/acpid/acpid.rc4
-rwxr-xr-xsrc/alsa-utils/alsa6
-rwxr-xr-xsrc/lm_sensors/fancontrol.rc4
-rwxr-xr-xsrc/lm_sensors/healthd.rc4
-rwxr-xr-xsrc/lm_sensors/sensord.rc4
-rwxr-xr-xsrc/openssh/sshd4
-rwxr-xr-xsrc/openssh/sshd-close-sessions2
-rwxr-xr-xsrc/rfkill/rc.d4
-rwxr-xr-xsrc/syslog-ng/syslog-ng.rc2
9 files changed, 17 insertions, 17 deletions
diff --git a/src/acpid/acpid.rc b/src/acpid/acpid.rc
index 674f462..dd1478e 100755
--- a/src/acpid/acpid.rc
+++ b/src/acpid/acpid.rc
@@ -5,11 +5,11 @@
[[ -f /etc/conf.d/acpid ]] && . /etc/conf.d/acpid
-PID=$(pidof -o %PPID /usr/sbin/acpid)
+PID=$(pidof -o %PPID /usr/bin/acpid)
case "$1" in
start)
stat_busy "Starting acpid"
- [ -z "$PID" ] && /usr/sbin/acpid $ACPID_ARGS
+ [ -z "$PID" ] && /usr/bin/acpid $ACPID_ARGS
if [ $? -gt 0 ]; then
stat_fail
else
diff --git a/src/alsa-utils/alsa b/src/alsa-utils/alsa
index 1e7b57f..447c5d8 100755
--- a/src/alsa-utils/alsa
+++ b/src/alsa-utils/alsa
@@ -8,9 +8,9 @@ case "$1" in
start)
stat_busy "Restoring ALSA Levels"
if [[ ! -e /var/lib/alsa/asound.state ]]; then
- /usr/sbin/alsactl $ALSA_ARGS store || { stat_fail; exit 1; }
+ /usr/bin/alsactl $ALSA_ARGS store || { stat_fail; exit 1; }
fi
- if /usr/sbin/alsactl $ALSA_ARGS restore; then
+ if /usr/bin/alsactl $ALSA_ARGS restore; then
stat_done
add_daemon alsa
else
@@ -34,7 +34,7 @@ case "$1" in
SAVE_VOLUME=${SAVE_VOLUME:-yes}
if [[ "$SAVE_VOLUME" = "yes" ]]; then
stat_busy "Saving ALSA Levels"
- /usr/sbin/alsactl $ALSA_ARGS store || { stat_fail; exit 1; }
+ /usr/bin/alsactl $ALSA_ARGS store || { stat_fail; exit 1; }
else
stat_busy "Stopping ALSA"
fi
diff --git a/src/lm_sensors/fancontrol.rc b/src/lm_sensors/fancontrol.rc
index 8e98d06..c20ce16 100755
--- a/src/lm_sensors/fancontrol.rc
+++ b/src/lm_sensors/fancontrol.rc
@@ -3,11 +3,11 @@
. /etc/rc.conf
. /etc/rc.d/functions
-PID=$(pidof -o %PPID -x /usr/sbin/fancontrol)
+PID=$(pidof -o %PPID -x /usr/bin/fancontrol)
case "$1" in
start)
stat_busy "Starting fancontrol"
- [ -z "$PID" ] && /usr/sbin/fancontrol -D &>/dev/null
+ [ -z "$PID" ] && /usr/bin/fancontrol -D &>/dev/null
if [ $? -gt 0 -o -n "$PID" ]; then
stat_fail
else
diff --git a/src/lm_sensors/healthd.rc b/src/lm_sensors/healthd.rc
index f50f4a6..4f83c8b 100755
--- a/src/lm_sensors/healthd.rc
+++ b/src/lm_sensors/healthd.rc
@@ -3,11 +3,11 @@
. /etc/rc.conf
. /etc/rc.d/functions
-PID=$(pidof -x -o %PPID /usr/sbin/healthd)
+PID=$(pidof -x -o %PPID /usr/bin/healthd)
case "${1}" in
start)
stat_busy "Starting Health Daemon"
- [ -z "${PID}" ] && /usr/sbin/healthd &> /dev/null
+ [ -z "${PID}" ] && /usr/bin/healthd &> /dev/null
if [ $? -gt 0 ]; then
stat_fail
else
diff --git a/src/lm_sensors/sensord.rc b/src/lm_sensors/sensord.rc
index e3ef4d2..ef9b870 100755
--- a/src/lm_sensors/sensord.rc
+++ b/src/lm_sensors/sensord.rc
@@ -4,11 +4,11 @@
. /etc/rc.d/functions
. /etc/conf.d/sensord
-PID=$(pidof -o %PPID /usr/sbin/sensord)
+PID=$(pidof -o %PPID /usr/bin/sensord)
case "$1" in
start)
stat_busy "Starting sensord"
- [ -z "$PID" ] && /usr/sbin/sensord ${SENSORD_ARGS}
+ [ -z "$PID" ] && /usr/bin/sensord ${SENSORD_ARGS}
if [ $? -gt 0 ]; then
stat_fail
else
diff --git a/src/openssh/sshd b/src/openssh/sshd
index d60804e..a25e738 100755
--- a/src/openssh/sshd
+++ b/src/openssh/sshd
@@ -6,7 +6,7 @@
PIDFILE=/run/sshd.pid
PID=$(cat $PIDFILE 2>/dev/null)
-if ! readlink -q /proc/$PID/exe | grep -q '^/usr/sbin/sshd'; then
+if ! readlink -q /proc/$PID/exe | grep -q '^/usr/bin/sshd'; then
PID=
rm $PIDFILE 2>/dev/null
fi
@@ -15,7 +15,7 @@ case "$1" in
start)
stat_busy 'Starting Secure Shell Daemon'
/usr/bin/ssh-keygen -A
- [[ -z $PID ]] && /usr/sbin/sshd $SSHD_ARGS
+ [[ -z $PID ]] && /usr/bin/sshd $SSHD_ARGS
if [[ $? -gt 0 ]]; then
stat_fail
else
diff --git a/src/openssh/sshd-close-sessions b/src/openssh/sshd-close-sessions
index be2a709..4291cc1 100755
--- a/src/openssh/sshd-close-sessions
+++ b/src/openssh/sshd-close-sessions
@@ -7,7 +7,7 @@ sshd_close_sessions () {
/etc/rc.d/sshd stop
stat_busy "Stopping Secure Shell Sessions"
for i in $(pgrep sshd); do
- if readlink -q /proc/$i/exe | grep -q '^/usr/sbin/sshd'; then
+ if readlink -q /proc/$i/exe | grep -q '^/usr/bin/sshd'; then
kill $i
fi
done &>/dev/null
diff --git a/src/rfkill/rc.d b/src/rfkill/rc.d
index ce90ee1..cce4009 100755
--- a/src/rfkill/rc.d
+++ b/src/rfkill/rc.d
@@ -8,7 +8,7 @@ case "$1" in
start)
for device in ${RFKILL_BLOCK}; do
stat_busy "Blocking rfkill device: ${device}"
- /usr/sbin/rfkill block ${device}
+ /usr/bin/rfkill block ${device}
if [ $? -eq 0 ]; then
stat_done
else
@@ -17,7 +17,7 @@ case "$1" in
done
for device in ${RFKILL_UNBLOCK}; do
stat_busy "Unblocking rfkill device: ${device}"
- /usr/sbin/rfkill unblock ${device}
+ /usr/bin/rfkill unblock ${device}
if [ $? -eq 0 ]; then
stat_done
else
diff --git a/src/syslog-ng/syslog-ng.rc b/src/syslog-ng/syslog-ng.rc
index d48b71e..f0d9ce3 100755
--- a/src/syslog-ng/syslog-ng.rc
+++ b/src/syslog-ng/syslog-ng.rc
@@ -25,7 +25,7 @@ case $1 in
start)
stat_busy "Starting Syslog-NG"
checkconfig
- if [[ -z $PID ]] && /usr/sbin/syslog-ng "${SYSLOG_NG_OPTS[@]}"; then
+ if [[ -z $PID ]] && /usr/bin/syslog-ng "${SYSLOG_NG_OPTS[@]}"; then
add_daemon syslog-ng
stat_done
else