From: Pascal Bach <pascal.bach@siemens.com>
Date: Wed, 21 Jan 2015 19:30:25 +0000 (-0800)
Subject: base-passwd: Don't replace $ variables in passwd and group files
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~31479
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=620b100f54c379661a8c48a1eb78ed94cd3b7a49;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

base-passwd: Don't replace $ variables in passwd and group files

This allows the usage of "$type$salt$encrypted_password" passwords in the passwd file.

Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb
index ec8f2afb225..a35ea9bd082 100644
--- a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb
+++ b/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb
@@ -75,11 +75,11 @@ python populate_packages_prepend() {
     preinst = """#!/bin/sh
 mkdir -p $D${sysconfdir}
 if [ ! -e $D${sysconfdir}/passwd ]; then
-\tcat << EOF > $D${sysconfdir}/passwd
+\tcat << 'EOF' > $D${sysconfdir}/passwd
 """ + passwd + """EOF
 fi
 if [ ! -e $D${sysconfdir}/group ]; then
-\tcat << EOF > $D${sysconfdir}/group
+\tcat << 'EOF' > $D${sysconfdir}/group
 """ + group + """EOF
 fi
 """