Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3da2eecad0b3f1b1932ee3a49dea98663d009246
commit 3da2eecad0b3f1b1932ee3a49dea98663d009246 Author: Miklos Vajna <[email protected]> Date: Thu Jan 15 00:27:52 2009 +0100 openssh-5.1p1-3-i686 - add status subcommand to rc.sshd diff --git a/source/network/openssh/FrugalBuild b/source/network/openssh/FrugalBuild index 467be3b..dd685cd 100644 --- a/source/network/openssh/FrugalBuild +++ b/source/network/openssh/FrugalBuild @@ -4,7 +4,7 @@ pkgname=openssh pkgver=5.1p1 -pkgrel=2 +pkgrel=3 pkgdesc='Secure Shell daemon and clients' url="http://www.openssh.com/" backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/sysconfig/tunnel') diff --git a/source/network/openssh/rc.sshd b/source/network/openssh/rc.sshd index 1ea8015..1f75fa0 100644 --- a/source/network/openssh/rc.sshd +++ b/source/network/openssh/rc.sshd @@ -1,8 +1,8 @@ #!/bin/bash -# (c) 2003 Vajna Miklos <[email protected]> +# (c) 2003, 2009 Vajna Miklos <[email protected]> # (c) 2006 Andras Voroskoi <[email protected]> -# rc.sshd for FrugalWare +# rc.sshd for Frugalware # distributed under GPL License # chkconfig: 2345 32 56 @@ -12,24 +12,23 @@ source /lib/initscripts/functions TEXTDOMAIN=sshd TEXTDOMAINDIR=/lib/initscripts/messages -actions=(restart start stop) +actions=(restart start stop status) daemon=$"SSH daemon" +pid="cat /var/run/sshd.pid 2>/dev/null" + rc_start() { start_msg - if [ ! -r /var/run/sshd.pid ]; then + if [ -z "$(eval $pid)" ]; then # creating host keys if [ ! -r /etc/ssh/ssh_host_key ]; then /usr/bin/ssh-keygen -t rsa1 -f /etc/ssh/ssh_host_key -N '' |logger - retval=$? fi if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then /usr/bin/ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N '' |logger - retval=$? fi if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then /usr/bin/ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N '' |logger - retval=$? fi /usr/sbin/sshd ok $? @@ -40,8 +39,8 @@ rc_start() { rc_stop() { stop_msg - if [ -r /var/run/sshd.pid ]; then - kill `cat /var/run/sshd.pid` + if [ -n "$(eval $pid)" ]; then + kill "$(eval $pid)" ok $? else ok 999 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
