aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-10-21 09:22:55 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-10-21 09:22:55 +0000
commit4a7fde37aaf32ca55527bd2b0207c617b3996c4b (patch)
tree3b8509e98cdedb7a01afaf7644979bcca3d86761
parent324acb3452a5bfa16e711ef0b22be938f2c8cba8 (diff)
downloadalpine_aports-4a7fde37aaf32ca55527bd2b0207c617b3996c4b.tar.bz2
alpine_aports-4a7fde37aaf32ca55527bd2b0207c617b3996c4b.tar.xz
alpine_aports-4a7fde37aaf32ca55527bd2b0207c617b3996c4b.zip
main/openssh: do not try kill nonexisting sshd session on shutdown
Fixes the error message on shutdown: sh: you need to specify whom to kill
-rw-r--r--main/openssh/APKBUILD4
-rw-r--r--main/openssh/sshd.initd4
2 files changed, 5 insertions, 3 deletions
diff --git a/main/openssh/APKBUILD b/main/openssh/APKBUILD
index db7525de45..6398fb21f8 100644
--- a/main/openssh/APKBUILD
+++ b/main/openssh/APKBUILD
@@ -2,7 +2,7 @@
2pkgname=openssh 2pkgname=openssh
3pkgver=5.8_p2 3pkgver=5.8_p2
4_myver=${pkgver%_*}${pkgver#*_} 4_myver=${pkgver%_*}${pkgver#*_}
5pkgrel=1 5pkgrel=2
6pkgdesc="Port of OpenBSD's free SSH release" 6pkgdesc="Port of OpenBSD's free SSH release"
7url="http://www.openssh.org/portable.html" 7url="http://www.openssh.org/portable.html"
8arch="all" 8arch="all"
@@ -89,5 +89,5 @@ client() {
89md5sums="88a4a83b0e0e60cd545430d4e4bd7e0c openssh-5.8p2.tar.gz 89md5sums="88a4a83b0e0e60cd545430d4e4bd7e0c openssh-5.8p2.tar.gz
904c96723cb6dd02f76fe263c4d68c6a6f openssh5.8-dynwindow_noneswitch.diff.gz 904c96723cb6dd02f76fe263c4d68c6a6f openssh5.8-dynwindow_noneswitch.diff.gz
91578fb646bab2d312172ec716970031b1 openssh5.8-peaktput.diff 91578fb646bab2d312172ec716970031b1 openssh5.8-peaktput.diff
92dda71d60ff5b4fbb61ad99fe83de6bc3 sshd.initd 92b35a2df5e951c3d315055332b6572352 sshd.initd
93b35e9f3829f4cfca07168fcba98749c7 sshd.confd" 93b35e9f3829f4cfca07168fcba98749c7 sshd.confd"
diff --git a/main/openssh/sshd.initd b/main/openssh/sshd.initd
index 912d435c99..35430c5e42 100644
--- a/main/openssh/sshd.initd
+++ b/main/openssh/sshd.initd
@@ -78,7 +78,9 @@ stop() {
78 if [ "$RC_RUNLEVEL" = "shutdown" ]; then 78 if [ "$RC_RUNLEVEL" = "shutdown" ]; then
79 ebegin "Shutting down ssh connections" 79 ebegin "Shutting down ssh connections"
80 _sshd_pids=$(pgrep "${SSHD_BINARY##*/}: .* \[priv]") 80 _sshd_pids=$(pgrep "${SSHD_BINARY##*/}: .* \[priv]")
81 kill -TERM $_sshd_pids 2>&1 >/dev/null 81 if [ -n "$_sshd_pids" ]; then
82 kill -TERM $_sshd_pids >/dev/null 2>&1
83 fi
82 eend 0 84 eend 0
83 fi 85 fi
84} 86}