openssh: use volatiles for managing /var/run/sshd
PATCH 1/1 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.
--- .../openssh/openssh-6.2p2/volatiles.99_sshd | 1 + meta/recipes-connectivity/openssh/openssh_6.2p2.bb | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-connectivity/openssh/openssh-6.2p2/volatiles.99_sshd
meta/recipes-connectivity/openssh/openssh-6.2p2/volatiles.99_sshd new file +1 -0
@@ -0,0 +1 @@ +d sshd sshd 0755 /var/run/sshd none
meta/recipes-connectivity/openssh/openssh_6.2p2.bb +6 -2
@@ -29,7 +29,8 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar. ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ file://sshd.socket \ file://[email protected] \ - file://sshdgenkeys.service " + file://sshdgenkeys.service \ + file://volatiles.99_sshd " PAM_SRC_URI = "file://sshd"
@@ -92,6 +93,9 @@ do_install_append () { install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd rm -f ${D}${bindir}/slogin ${D}${datadir}/Ssh.bin rmdir ${D}${localstatedir}/run/sshd ${D}${localstatedir}/run ${D}${localstatedir} + install -d ${D}/${sysconfdir}/default/volatiles + install -m 644 ${WORKDIR}/volatiles.99_sshd ${D}/${sysconfdir}/default/volatiles/99_sshd + # Create config files for read-only rootfs install -d ${D}${sysconfdir}/ssh 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 $ FILES_${PN}-scp = "${bindir}/scp.${BPN}" FILES_${PN}-ssh = "${bindir}/ssh.${BPN} ${sysconfdir}/ssh/ssh_config" FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd" -FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config ${sysconfdir}/ssh/sshd_config_readonly" +FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config ${sysconfdir}/ssh/sshd_config_readonly ${sysconfdir}/default/volatiles/99_sshd" FILES_${PN}-sftp = "${bindir}/sftp" FILES_${PN}-sftp-server = "${libexecdir}/sftp-server" FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*"
Signature · 1 line
1.7.1
Hi Ming,
Quoted 4 lines · Ming Liu
It fixes the following failure:
"fatal: Missing privilege separation directory:/var/run/sshd"when sshd is started through xinetd.
With this patch applied, openssh doesn't start anymore in standard images (e.g. core-image-sato-sdk)
root@qemux86-64:~# /etc/init.d/sshd restart /var/run/sshd must be owned by root and not group or world-writable.
Cheers,
Stefan
Quoted 48 lines
Signed-off-by Ming Liu <[email protected]>--- .../openssh/openssh-6.2p2/volatiles.99_sshd | 1 + meta/recipes-connectivity/openssh/openssh_6.2p2.bb | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-connectivity/openssh/openssh-6.2p2/volatiles.99_sshdmeta/recipes-connectivity/openssh/openssh-6.2p2/volatiles.99_sshd new file +1
-0@@ -0,0 +1 @@ +d sshd sshd 0755 /var/run/sshd nonemeta/recipes-connectivity/openssh/openssh_6.2p2.bb +6
-2@@ -29,7 +29,8 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar. ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ file://sshd.socket \ file://[email protected] \ - file://sshdgenkeys.service " + file://sshdgenkeys.service \ + file://volatiles.99_sshd " PAM_SRC_URI = "file://sshd"@@ -92,6 +93,9 @@ do_install_append () { install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd rm -f ${D}${bindir}/slogin ${D}${datadir}/Ssh.bin rmdir ${D}${localstatedir}/run/sshd ${D}${localstatedir}/run ${D}${localstatedir} + install -d ${D}/${sysconfdir}/default/volatiles + install -m 644 ${WORKDIR}/volatiles.99_sshd ${D}/${sysconfdir}/default/volatiles/99_sshd + # Create config files for read-only rootfs install -d ${D}${sysconfdir}/ssh 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 $ FILES_${PN}-scp = "${bindir}/scp.${BPN}" FILES_${PN}-ssh = "${bindir}/ssh.${BPN} ${sysconfdir}/ssh/ssh_config" FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd" -FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config ${sysconfdir}/ssh/sshd_config_readonly" +FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config ${sysconfdir}/ssh/sshd_config_readonly ${sysconfdir}/default/volatiles/99_sshd" FILES_${PN}-sftp = "${bindir}/sftp" FILES_${PN}-sftp-server = "${libexecdir}/sftp-server" FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*"
Quoted 6 lines · StefanX
Hi Ming,
Quoted 3 lines · Ming Liu
It fixes the following failure:
"fatal: Missing privilege separation directory:/var/run/sshd"
Quoted 6 lines
Quoted 1 line
when sshd is started through xinetd.
With this patch applied, openssh doesn't start anymore in standard images (e.g. core-image-sato-sdk)
root@qemux86-64:~# /etc/init.d/sshd restart /var/run/sshd must be owned by root and not group or world-writable.
Sorry, I made a mistake, this patch is a little modifiled to which my test based on, and I didn't notice that, I will send the V1 soon.
Thanks,
Ming
Quoted 52 lines
Cheers,
Stefan
Quoted 47 lines
Signed-off-by Ming Liu <[email protected]>--- .../openssh/openssh-6.2p2/volatiles.99_sshd | 1 + meta/recipes-connectivity/openssh/openssh_6.2p2.bb | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-)create mode 100644 meta/recipes-connectivity/openssh/openssh-6.2p2/volatiles.99_sshd
meta/recipes-connectivity/openssh/openssh-6.2p2/volatiles.99_sshd new file +1
-0@@ -0,0 +1 @@ +d sshd sshd 0755 /var/run/sshd nonemeta/recipes-connectivity/openssh/openssh_6.2p2.bb +6
-2@@ -29,7 +29,8 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar. ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ file://sshd.socket \ file://[email protected] \ - file://sshdgenkeys.service " + file://sshdgenkeys.service \ + file://volatiles.99_sshd " PAM_SRC_URI = "file://sshd"@@ -92,6 +93,9 @@ do_install_append () { install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/sshd rm -f ${D}${bindir}/slogin ${D}${datadir}/Ssh.bin rmdir ${D}${localstatedir}/run/sshd ${D}${localstatedir}/run ${D}${localstatedir} + install -d ${D}/${sysconfdir}/default/volatiles + install -m 644 ${WORKDIR}/volatiles.99_sshd ${D}/${sysconfdir}/default/volatiles/99_sshd + # Create config files for read-only rootfs install -d ${D}${sysconfdir}/ssh 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 $ FILES_${PN}-scp = "${bindir}/scp.${BPN}" FILES_${PN}-ssh = "${bindir}/ssh.${BPN} ${sysconfdir}/ssh/ssh_config" FILES_${PN}-sshd = "${sbindir}/sshd ${sysconfdir}/init.d/sshd" -FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config ${sysconfdir}/ssh/sshd_config_readonly" +FILES_${PN}-sshd += "${sysconfdir}/ssh/moduli ${sysconfdir}/ssh/sshd_config ${sysconfdir}/ssh/sshd_config_readonly ${sysconfdir}/default/volatiles/99_sshd" FILES_${PN}-sftp = "${bindir}/sftp" FILES_${PN}-sftp-server = "${libexecdir}/sftp-server" FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*"