[oe-commits] Phil Blundell : useradd.bbclass: use correct value for $D in postinst functions

[git version control]

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

Author: Phil Blundell <philb at gnu.org>
Date:   Wed Sep  7 21:20:12 2011 +0100

useradd.bbclass: use correct value for $D in postinst functions

This corrects the location of the password file used during package installation.

See http://lists.linuxtogo.org/pipermail/openembedded-core/2011-September/009183.html and subsequent discussion.

Signed-off-by: Phil Blundell <philb at gnu.org>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/useradd.bbclass |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index 5f5b68d..1e03a04 100644
--- a/meta/classes/useradd.bbclass
+++ b/meta/classes/useradd.bbclass
@@ -15,8 +15,8 @@ SYSROOT=""
 
 if test "x$D" != "x"; then
 	# Installing into a sysroot
-	SYSROOT="${STAGING_DIR_TARGET}"
-	OPT="--root ${STAGING_DIR_TARGET}"
+	SYSROOT="$D"
+	OPT="--root $D"
 
 	# Add groups and users defined for all recipe packages
 	GROUPADD_PARAM="${@get_all_cmd_params(d, 'group')}"
@@ -79,7 +79,7 @@ useradd_sysroot () {
 
 	# Explicitly set $D since it isn't set to anything
 	# before do_install
-	D=${D}
+	D=${STAGING_DIR_TARGET}
 	useradd_preinst
 }