diff options
author | Adrian C. (anrxc) <anrxc@sysphere.org> | 2013-05-25 22:15:39 +0200 |
---|---|---|
committer | Adrian C. (anrxc) <anrxc@sysphere.org> | 2013-05-25 22:15:39 +0200 |
commit | 57cd084ff2f96f001045a8849b68877e9db2f6d0 (patch) | |
tree | 6727a3351882b3ad62115ecac4f2d537e5e1731d /src/openssh | |
parent | 2bd6b7a88739f24b277bb41eb6e6325c8f97c181 (diff) | |
download | rcdscripts-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.
Diffstat (limited to 'src/openssh')
-rwxr-xr-x | src/openssh/sshd | 4 | ||||
-rwxr-xr-x | src/openssh/sshd-close-sessions | 2 |
2 files changed, 3 insertions, 3 deletions
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 |