diff options
author | Damien Miller <djm@mindrot.org> | 2000-10-16 12:25:17 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-10-16 12:25:17 +1100 |
commit | 2b2cf52471efcff7d5cef4bbf6d724f8c84b0f39 (patch) | |
tree | d7b26b1f8eb3ea62b96cbc2a3a0848d8d0d3de6f | |
parent | cd57198b3e0857218ba461b174063d763dcc9d81 (diff) |
- Added condrestart to Redhat init script. Patch from Pekka Savola
<pekkas@netcore.fi>
- Update version in Redhat spec file
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | contrib/redhat/openssh.spec | 2 | ||||
-rwxr-xr-x | contrib/redhat/sshd.init | 9 |
3 files changed, 14 insertions, 3 deletions
@@ -26,7 +26,11 @@ | |||
26 | - markus@cvs.openbsd.org 2000/10/15 08:18:31 | 26 | - markus@cvs.openbsd.org 2000/10/15 08:18:31 |
27 | [rijndael.c] | 27 | [rijndael.c] |
28 | typo | 28 | typo |
29 | - Copy manpages back over from OpenBSD - too tedious to wade through diffs | 29 | - (djm) Copy manpages back over from OpenBSD - too tedious to wade |
30 | through diffs | ||
31 | - Added condrestart to Redhat init script. Patch from Pekka Savola | ||
32 | <pekkas@netcore.fi> | ||
33 | - Update version in Redhat spec file | ||
30 | 34 | ||
31 | 20001015 | 35 | 20001015 |
32 | - (djm) Fix ssh2 hang on background processes at logout. | 36 | - (djm) Fix ssh2 hang on background processes at logout. |
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index d1bd16701..95be389c8 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec | |||
@@ -1,5 +1,5 @@ | |||
1 | # Version of OpenSSH | 1 | # Version of OpenSSH |
2 | %define oversion 2.2.0p2 | 2 | %define oversion 2.3.0p1 |
3 | 3 | ||
4 | # Version of ssh-askpass | 4 | # Version of ssh-askpass |
5 | %define aversion 1.0.2 | 5 | %define aversion 1.0.2 |
diff --git a/contrib/redhat/sshd.init b/contrib/redhat/sshd.init index a30d48065..83c10a885 100755 --- a/contrib/redhat/sshd.init +++ b/contrib/redhat/sshd.init | |||
@@ -81,12 +81,19 @@ case "$1" in | |||
81 | $0 start | 81 | $0 start |
82 | RETVAL=$? | 82 | RETVAL=$? |
83 | ;; | 83 | ;; |
84 | condrestart) | ||
85 | if [ -f /var/lock/subsys/sshd ] ; then | ||
86 | $0 stop | ||
87 | $0 start | ||
88 | RETVAL=$? | ||
89 | fi | ||
90 | ;; | ||
84 | status) | 91 | status) |
85 | status sshd | 92 | status sshd |
86 | RETVAL=$? | 93 | RETVAL=$? |
87 | ;; | 94 | ;; |
88 | *) | 95 | *) |
89 | echo "Usage: sshd {start|stop|restart|status}" | 96 | echo "Usage: sshd {start|stop|restart|status|condrestart}" |
90 | exit 1 | 97 | exit 1 |
91 | ;; | 98 | ;; |
92 | esac | 99 | esac |