summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2011-05-27 21:33:13 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2011-05-27 21:33:13 +0200
commit0b95a170d8afdc6c6d32e0f7619198f35770a887 (patch)
tree28f24e03ff7e77e4472b16241ca1aced5b063b9e
parent02bca259924b70cf5371f57b75f9224dc7e55636 (diff)
downloadptxdist-0b95a170d8afdc6c6d32e0f7619198f35770a887.tar.gz
ptxdist-0b95a170d8afdc6c6d32e0f7619198f35770a887.tar.xz
openssh: make sure /var/run/sshd exists when used with systemd
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--generic/usr/lib/tmpfiles.d/ssh.conf1
-rw-r--r--rules/openssh.make2
2 files changed, 3 insertions, 0 deletions
diff --git a/generic/usr/lib/tmpfiles.d/ssh.conf b/generic/usr/lib/tmpfiles.d/ssh.conf
new file mode 100644
index 000000000..cc208db9f
--- /dev/null
+++ b/generic/usr/lib/tmpfiles.d/ssh.conf
@@ -0,0 +1 @@
+d /run/sshd 0700 root root -
diff --git a/rules/openssh.make b/rules/openssh.make
index da77a2a67..43c3b5af9 100644
--- a/rules/openssh.make
+++ b/rules/openssh.make
@@ -110,6 +110,8 @@ ifdef PTXCONF_OPENSSH_SSHD_SYSTEMD_UNIT
/lib/systemd/system/sshd@.service)
@$(call install_link, openssh, ../sshd.socket, \
/lib/systemd/system/sockets.target.wants/sshd.socket)
+ @$(call install_alternative, openssh, 0, 0, 0644, \
+ /usr/lib/tmpfiles.d/ssh.conf)
endif
endif