[oe-commits] Pascal Bach : base-passwd: Don' t replace $ variables in passwd and group files

git at git.openembedded.org git at git.openembedded.org
Thu Jan 29 15:37:07 UTC 2015


Module: openembedded-core.git
Branch: master
Commit: 620b100f54c379661a8c48a1eb78ed94cd3b7a49
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=620b100f54c379661a8c48a1eb78ed94cd3b7a49

Author: Pascal Bach <pascal.bach at siemens.com>
Date:   Wed Jan 21 11:30:25 2015 -0800

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 at siemens.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/recipes-core/base-passwd/base-passwd_3.5.29.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 ec8f2af..a35ea9b 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
 """



More information about the Openembedded-commits mailing list