aboutsummaryrefslogtreecommitdiffstats
path: root/main/openssh/sshd.confd
diff options
context:
space:
mode:
authorPrzemyslaw Pawelczyk <przemoc@zoho.com>2016-08-19 01:37:11 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2016-08-22 17:07:08 -0700
commit528334a1c482176781261a8a8a1c7a5aec582c1b (patch)
tree1985d296a139eec937b1c5de0410fd4ff63e2649 /main/openssh/sshd.confd
parent70327f5cd08765c9786ec9bc09532d5a033a8a83 (diff)
downloadaports-528334a1c482176781261a8a8a1c7a5aec582c1b.tar.bz2
aports-528334a1c482176781261a8a8a1c7a5aec582c1b.tar.xz
main/openssh: Fix pid dir expectation in confd and initd files.
Since commit 71eb72d62425082850604f526dbcbfdcf2808c31 (2016-03-13, pre-v3.4) openssh is build with pid dir explicitly set to /run. The change was not reflected in sshd.confd or sshd.initd, though, and sadly not even in the commit message. (Before it was set implicitly to /var/run.) /var/run and /run semantics are the same, but AL does not truly guarantee (at least yet) that the first is symlinked to the latter (which is a common practice among Linux distributions nowadays, where /run is tmpfs mounted very early - in AL openrc's init.sh does that). alpine-baselayout package simply has run and var/run directories and they are not related in any way from the package point of view. Unless you create such symlink yourself or it is created via openrc's boot service bootmisc (performing /var/run -> /run migration and some other stuff), you cannot use /var/run/ and /run/ paths interchangeably. The patch should be applied to 3.4-stable branch too (without changing pkgver used there and with proper pkgrel increment, of course). I was seeing false crashed state next to sshd in rc-status after upgrading AL from 3.3 to 3.4 on machine where bootmisc is not used. (I don't think it's a grave enough lack to warrant patch rejection.)
Diffstat (limited to 'main/openssh/sshd.confd')
-rw-r--r--main/openssh/sshd.confd2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/openssh/sshd.confd b/main/openssh/sshd.confd
index 28952b4a28..dbe01daf52 100644
--- a/main/openssh/sshd.confd
+++ b/main/openssh/sshd.confd
@@ -13,7 +13,7 @@ SSHD_OPTS=""
# Pid file to use (needs to be absolute path).
-#SSHD_PIDFILE="/var/run/sshd.pid"
+#SSHD_PIDFILE="/run/sshd.pid"
# Path to the sshd binary (needs to be absolute path).