diff options
| author | Armijn Hemel <armijn@gpl-violations.org> | 2006-03-10 17:22:58 +0000 |
|---|---|---|
| committer | Armijn Hemel <armijn@gpl-violations.org> | 2006-03-10 17:22:58 +0000 |
| commit | 1fdbc347ce6c318f785422810f37226053255475 (patch) | |
| tree | 89091682c3b0f1471828e9bdbb9025efbe72ffb3 /pkgs/servers | |
| parent | 9159ca026d331f5790214655c6d75ef4cdd7edc4 (diff) | |
| download | nixlib-1fdbc347ce6c318f785422810f37226053255475.tar nixlib-1fdbc347ce6c318f785422810f37226053255475.tar.gz nixlib-1fdbc347ce6c318f785422810f37226053255475.tar.bz2 nixlib-1fdbc347ce6c318f785422810f37226053255475.tar.lz nixlib-1fdbc347ce6c318f785422810f37226053255475.tar.xz nixlib-1fdbc347ce6c318f785422810f37226053255475.tar.zst nixlib-1fdbc347ce6c318f785422810f37226053255475.zip | |
adapt ssh script to use our generic functions.
svn path=/nixpkgs/trunk/; revision=5028
Diffstat (limited to 'pkgs/servers')
| -rwxr-xr-x | pkgs/servers/ssh-script/sshd | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/servers/ssh-script/sshd b/pkgs/servers/ssh-script/sshd index 5fb92c7185ad..744bb49abc98 100755 --- a/pkgs/servers/ssh-script/sshd +++ b/pkgs/servers/ssh-script/sshd @@ -13,7 +13,7 @@ # pidfile: /var/run/sshd.pid # source function library -. @initscripts@/etc/rc.d/init.d/functions +source @initscripts@/functions # pull in sysconfig settings [ -f /etc/sysconfig/sshd ] && . /etc/sysconfig/sshd @@ -34,7 +34,7 @@ do_rsa1_keygen() { if [ ! -s $RSA1_KEY ]; then echo -n $"Generating SSH1 RSA host key: " if $KEYGEN -q -t rsa1 -f $RSA1_KEY -C '' -N '' >&/dev/null; then - @coreutils/bin/chmod 600 $RSA1_KEY + @coreutils@/bin/chmod 600 $RSA1_KEY @coreutils@/bin/chmod 644 $RSA1_KEY.pub success $"RSA1 key generation" echo @@ -88,7 +88,7 @@ do_restart_sanity_check() fi } -start() +startService() { # Create keys if necessary do_rsa1_keygen @@ -96,13 +96,14 @@ start() do_dsa_keygen echo -n $"Starting $prog:" - @initscripts@/sbin/initlog -c "$SSHD $OPTIONS" && success || failure + #@initscripts@/sbin/initlog -c "$SSHD $OPTIONS" && success || failure + $SSHD $OPTIONS RETVAL=$? [ "$RETVAL" = 0 ] && @coreutils@/bin/touch /var/lock/subsys/sshd echo } -stop() +stopService() { echo -n $"Stopping $prog:" killproc $SSHD -TERM |