diff options
author | Xiaofeng Yan <xiaofeng.yan@windriver.com> | 2011-08-31 10:48:11 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-31 19:59:59 +0100 |
commit | c9f5a4f9306501ee269cbcefeeab68c3819c7d03 (patch) | |
tree | 3a1c34b717de3a231f612ab0c23060a06daf751c | |
parent | d5edc9c1a0de0df9f2fb16f29592d6c9fc27e92d (diff) | |
download | poky-c9f5a4f9306501ee269cbcefeeab68c3819c7d03.tar.gz |
dropbear: Change the path to find configuration file and add a configuration file for dropbear
dropbear will check "/etc/pam.d/sshd" which comes from package "openssh" \
When enabling pam supporting. But if we only install dropbear \
package without package "openssh", then "dropbear" will not \
find a configuration file.
The changes are as follow for fixing this bug:
- Change the path to find configuration file (/etc/pam.d/sshd --> /etc/pam.d/dropbear)
- Add a configuration file "/etc/pam.d/dropbear"
(From OE-Core rev: 48dcb8fc7b669b27160dde33079f40551853702b)
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-core/dropbear/dropbear.inc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc index 5af9ebd4d0..1582f2e703 100644 --- a/meta/recipes-core/dropbear/dropbear.inc +++ b/meta/recipes-core/dropbear/dropbear.inc | |||
@@ -19,7 +19,9 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.gz \ | |||
19 | file://init \ | 19 | file://init \ |
20 | ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} " | 20 | ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} " |
21 | 21 | ||
22 | PAM_SRC_URI = "file://dropbear-enable-pam.patch" | 22 | PAM_SRC_URI = "file://dropbear-enable-pam.patch \ |
23 | file://dropbear-configuration-file.patch \ | ||
24 | file://dropbear" | ||
23 | 25 | ||
24 | inherit autotools update-rc.d | 26 | inherit autotools update-rc.d |
25 | 27 | ||
@@ -68,6 +70,14 @@ do_install() { | |||
68 | -e 's,/usr/bin,${bindir},g' \ | 70 | -e 's,/usr/bin,${bindir},g' \ |
69 | -e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/dropbear | 71 | -e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/dropbear |
70 | chmod 755 ${D}${sysconfdir}/init.d/dropbear | 72 | chmod 755 ${D}${sysconfdir}/init.d/dropbear |
73 | for i in ${DISTRO_FEATURES}; | ||
74 | do | ||
75 | if [ ${i} = "pam" ]; then | ||
76 | install -d ${D}${sysconfdir}/pam.d | ||
77 | install -m 0644 ${WORKDIR}/dropbear ${D}${sysconfdir}/pam.d/ | ||
78 | fi | ||
79 | done | ||
80 | |||
71 | } | 81 | } |
72 | 82 | ||
73 | pkg_postinst_${PN} () { | 83 | pkg_postinst_${PN} () { |