summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssh
diff options
context:
space:
mode:
authorMing Liu <ming.liu@windriver.com>2013-09-16 09:50:58 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-17 14:35:19 +0100
commit30911505901e7f96f3a3a3abb7b446c8bd483b97 (patch)
treeddceefd23acaf42c8cc511d40c081f5aaf86f8b6 /meta/recipes-connectivity/openssh
parent242ad61580bdbeed354f65081f1ddb6f03cab257 (diff)
downloadpoky-30911505901e7f96f3a3a3abb7b446c8bd483b97.tar.gz
openssh: use volatiles for managing /var/run/sshd
It fixes the following failure: "fatal: Missing privilege separation directory: /var/run/sshd" when sshd is started through xinetd. (From OE-Core rev: a343c32891aa46a7f7d5f0cc6d1266a387900dad) Signed-off-by: Ming Liu <ming.liu@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssh')
-rw-r--r--meta/recipes-connectivity/openssh/openssh-6.2p2/volatiles.99_sshd1
-rw-r--r--meta/recipes-connectivity/openssh/openssh_6.2p2.bb8
2 files changed, 7 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/openssh/openssh-6.2p2/volatiles.99_sshd b/meta/recipes-connectivity/openssh/openssh-6.2p2/volatiles.99_sshd
new file mode 100644
index 0000000000..122320a719
--- /dev/null
+++ b/meta/recipes-connectivity/openssh/openssh-6.2p2/volatiles.99_sshd
@@ -0,0 +1 @@
d root root 0755 /var/run/sshd none
diff --git a/meta/recipes-connectivity/openssh/openssh_6.2p2.bb b/meta/recipes-connectivity/openssh/openssh_6.2p2.bb
index 3a7f50d5fb..bb5c79eb5b 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.2p2.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.2p2.bb
@@ -29,7 +29,8 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
29 ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ 29 ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
30 file://sshd.socket \ 30 file://sshd.socket \
31 file://sshd@.service \ 31 file://sshd@.service \
32 file://sshdgenkeys.service " 32 file://sshdgenkeys.service \
33 file://volatiles.99_sshd "
33 34
34PAM_SRC_URI = "file://sshd" 35PAM_SRC_URI = "file://sshd"
35 36
@@ -92,6 +93,9 @@ do_install_append () {
92 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd 93 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd
93 rm -f ${D}${bindir}/slogin ${D}${datadir}/Ssh.bin 94 rm -f ${D}${bindir}/slogin ${D}${datadir}/Ssh.bin
94 rmdir ${D}${localstatedir}/run/sshd ${D}${localstatedir}/run ${D}${localstatedir} 95 rmdir ${D}${localstatedir}/run/sshd ${D}${localstatedir}/run ${D}${localstatedir}
96 install -d ${D}/${sysconfdir}/default/volatiles
97 install -m 644 ${WORKDIR}/volatiles.99_sshd ${D}/${sysconfdir}/default/volatiles/99_sshd
98
95 # Create config files for read-only rootfs 99 # Create config files for read-only rootfs
96 install -d ${D}${sysconfdir}/ssh 100 install -d ${D}${sysconfdir}/ssh
97 install -m 644 ${WORKDIR}/sshd_config ${D}${sysconfdir}/ssh/sshd_config_readonly 101 install -m 644 ${WORKDIR}/sshd_config ${D}${sysconfdir}/ssh/sshd_config_readonly
@@ -116,7 +120,7 @@ PACKAGES =+ "${PN}-keygen ${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-sftp ${PN}-misc $
116FILES_${PN}-scp = "${bindir}/scp.${BPN}" 120FILES_${PN}-scp = "${bindir}/scp.${BPN}"
117FILES_${PN}-ssh = "${bindir}/ssh.${BPN} ${sysconfdir}/ssh/ssh_config" 121FILES_${PN}-ssh = "${bindir}/ssh.${BPN} ${sysconfdir}/ssh/ssh_config"
118FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd" 122FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd"
119FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config ${sysconfdir}/ssh/sshd_config_readonly" 123FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config ${sysconfdir}/ssh/sshd_config_readonly ${sysconfdir}/default/volatiles/99_sshd"
120FILES_${PN}-sftp = "${bindir}/sftp" 124FILES_${PN}-sftp = "${bindir}/sftp"
121FILES_${PN}-sftp-server = "${libexecdir}/sftp-server" 125FILES_${PN}-sftp-server = "${libexecdir}/sftp-server"
122FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*" 126FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*"