1 files changed, 4 insertions, 0 deletions

diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb
index 6ba3971e32..4d246126a2 100644
--- a/meta/recipes-core/base-files/base-files_3.0.14.bb
+++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
@@ -136,6 +136,10 @@ do_install () {
                 echo ${hostname} > ${D}${sysconfdir}/hostname
                 echo "127.0.1.1 ${hostname}" >> ${D}${sysconfdir}/hosts
         fi
+
+        if ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'false', 'true', d)}; then
+                sed -i '/^::1/s/ localhost//' ${D}${sysconfdir}/hosts
+        fi
 }
 
 do_install:append:libc-glibc () {