diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2018-06-07 11:48:40 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-15 17:56:25 +0100 |
commit | 89cbaca35943228aef60cfbc8ce1d2cb245b11e6 (patch) | |
tree | 12a29513daa130cfb496f12aa7c8a7867b81a6e7 /meta/classes/rootfs-postcommands.bbclass | |
parent | 05881bbf353f05d4c613f76b3cd16432dec239a1 (diff) | |
download | poky-89cbaca35943228aef60cfbc8ce1d2cb245b11e6.tar.gz |
rootfs-postcommands.bbclass: drop obsolete sshd UseDNS rootfs postprocessing
The sshd UseDNS option has defaulted to "no" since openssh 6.8p1,
so it's no longer necessary to postprocess the rootfs to force the
option:
https://www.openssh.com/txt/release-6.8
(From OE-Core rev: 0cb4f11614bd3b17db8e6b3516761193cd45d082)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/rootfs-postcommands.bbclass')
-rw-r--r-- | meta/classes/rootfs-postcommands.bbclass | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index 221869e04c..9d4d95e994 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass | |||
@@ -36,11 +36,6 @@ ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("DISTRO_FEATURES", "systemd" | |||
36 | 36 | ||
37 | ROOTFS_POSTPROCESS_COMMAND += 'empty_var_volatile;' | 37 | ROOTFS_POSTPROCESS_COMMAND += 'empty_var_volatile;' |
38 | 38 | ||
39 | # Disable DNS lookups, the SSH_DISABLE_DNS_LOOKUP can be overridden to allow | ||
40 | # distros to choose not to take this change | ||
41 | SSH_DISABLE_DNS_LOOKUP ?= " ssh_disable_dns_lookup ; " | ||
42 | ROOTFS_POSTPROCESS_COMMAND_append_qemuall = "${SSH_DISABLE_DNS_LOOKUP}" | ||
43 | |||
44 | # Sort the user and group entries in /etc by ID in order to make the content | 39 | # Sort the user and group entries in /etc by ID in order to make the content |
45 | # deterministic. Package installs are not deterministic, causing the ordering | 40 | # deterministic. Package installs are not deterministic, causing the ordering |
46 | # of entries to change between builds. In case that this isn't desired, | 41 | # of entries to change between builds. In case that this isn't desired, |
@@ -171,12 +166,6 @@ ssh_allow_empty_password () { | |||
171 | fi | 166 | fi |
172 | } | 167 | } |
173 | 168 | ||
174 | ssh_disable_dns_lookup () { | ||
175 | if [ -e ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config ]; then | ||
176 | sed -i -e 's:#UseDNS yes:UseDNS no:' ${IMAGE_ROOTFS}${sysconfdir}/ssh/sshd_config | ||
177 | fi | ||
178 | } | ||
179 | |||
180 | python sort_passwd () { | 169 | python sort_passwd () { |
181 | import rootfspostcommands | 170 | import rootfspostcommands |
182 | rootfspostcommands.sort_passwd(d.expand('${IMAGE_ROOTFS}${sysconfdir}')) | 171 | rootfspostcommands.sort_passwd(d.expand('${IMAGE_ROOTFS}${sysconfdir}')) |