Patchwork [4/5] shadow: Generate the shadow files at rootfs construction

login
register
mail settings
Submitter Mark Hatle
Date Nov. 10, 2011, 6:30 p.m.
Message ID <e489b551c3b68f94e16501667309408e42aa3227.1320949721.git.mark.hatle@windriver.com>
Download mbox | patch
Permalink /patch/14769/
State Accepted
Commit 662431ace246e9bb35ad8d0ddd0510193f93517d
Headers show

Comments

Mark Hatle - Nov. 10, 2011, 6:30 p.m.
With the recent changes to the shadow-native package support "--root",
we can now convert the passwd/group files to their shadow forms while
doing the rootfs install, instead of waiting to run on the target.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 meta/recipes-extended/shadow/shadow_4.1.4.3.bb |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

Patch

diff --git a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
index 5bc4a61..25330a4 100644
--- a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
+++ b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
@@ -9,7 +9,7 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \
 
 DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_PLUGINS}', '', d)}"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \
            file://login_defs_pam.sed \
@@ -128,11 +128,13 @@  pkg_postinst_${PN} () {
 	update-alternatives --install ${base_sbindir}/vigr vigr vigr.${PN} 200
 
 	if [ "x$D" != "x" ]; then
-		exit 1
-	fi  
+	  rootarg="--root=$D"
+	else
+	  rootarg=""
+	fi
 
-	pwconv
-	grpconv
+	pwconv $rootarg
+	grpconv $rootarg
 }
 
 pkg_prerm_${PN} () {