diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2016-09-24 16:23:42 +0200 |
|---|---|---|
| committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2016-09-24 18:08:21 +0200 |
| commit | b938fee8b0ab185bb036cde17537dd0ad65ab3e1 (patch) | |
| tree | 1e80370f832f7a77d2ec5d5c491e760fab673007 /meta-agl/classes/useradd_base.bbclass | |
| parent | 43e2b8df97d732eae4c34ac7763dc108e9dcf0b4 (diff) | |
Update useradd overlays in meta-agl
It turns out there is an escaping fix in yocto master
not yet backported to krogoth.
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10062
Change-Id: Ia08fa024b3b5372e2fb792c4d0ab1a053e1f5745
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-agl/classes/useradd_base.bbclass')
| -rw-r--r-- | meta-agl/classes/useradd_base.bbclass | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/meta-agl/classes/useradd_base.bbclass b/meta-agl/classes/useradd_base.bbclass index 9b8f5c220..ba87edc57 100644 --- a/meta-agl/classes/useradd_base.bbclass +++ b/meta-agl/classes/useradd_base.bbclass @@ -17,8 +17,7 @@ perform_groupadd () { local groupname=`echo "$opts" | awk '{ print $NF }'` local group_exists="`grep "^$groupname:" $rootdir/etc/group || true`" if test "x$group_exists" = "x"; then - opts=`echo $opts | sed s/\'/\"/g` - eval flock -x -w 100 $rootdir${sysconfdir} -c \'$PSEUDO groupadd $opts\' || true + eval flock -x $rootdir${sysconfdir} -c \"$PSEUDO groupadd \$opts\" || true group_exists="`grep "^$groupname:" $rootdir/etc/group || true`" if test "x$group_exists" = "x"; then bbfatal "${PN}: groupadd command did not succeed." @@ -35,8 +34,7 @@ perform_useradd () { local username=`echo "$opts" | awk '{ print $NF }'` local user_exists="`grep "^$username:" $rootdir/etc/passwd || true`" if test "x$user_exists" = "x"; then - opts=`echo $opts | sed s/\'/\"/g` - eval flock -x -w 100 $rootdir${sysconfdir} -c \'$PSEUDO useradd $opts\' || true + eval flock -x $rootdir${sysconfdir} -c \"$PSEUDO useradd \$opts\" || true user_exists="`grep "^$username:" $rootdir/etc/passwd || true`" if test "x$user_exists" = "x"; then bbfatal "${PN}: useradd command did not succeed." @@ -53,17 +51,9 @@ perform_groupmems () { local groupname=`echo "$opts" | awk '{ for (i = 1; i < NF; i++) if ($i == "-g" || $i == "--group") print $(i+1) }'` local username=`echo "$opts" | awk '{ for (i = 1; i < NF; i++) if ($i == "-a" || $i == "--add") print $(i+1) }'` bbnote "${PN}: Running groupmems command with group $groupname and user $username" - # groupmems fails if /etc/gshadow does not exist - local gshadow="" - if [ -f $rootdir${sysconfdir}/gshadow ]; then - gshadow="yes" - else - gshadow="no" - touch $rootdir${sysconfdir}/gshadow - fi local mem_exists="`grep "^$groupname:[^:]*:[^:]*:\([^,]*,\)*$username\(,[^,]*\)*" $rootdir/etc/group || true`" if test "x$mem_exists" = "x"; then - eval flock -x -w 100 $rootdir${sysconfdir} -c \'$PSEUDO groupmems $opts\' || true + eval flock -x $rootdir${sysconfdir} -c \"$PSEUDO groupmems \$opts\" || true mem_exists="`grep "^$groupname:[^:]*:[^:]*:\([^,]*,\)*$username\(,[^,]*\)*" $rootdir/etc/group || true`" if test "x$mem_exists" = "x"; then bbfatal "${PN}: groupmems command did not succeed." @@ -71,10 +61,6 @@ perform_groupmems () { else bbnote "${PN}: group $groupname already contains $username, not re-adding it" fi - if test "x$gshadow" = "xno"; then - rm -f $rootdir${sysconfdir}/gshadow - rm -f $rootdir${sysconfdir}/gshadow- - fi } perform_groupdel () { @@ -84,7 +70,7 @@ perform_groupdel () { local groupname=`echo "$opts" | awk '{ print $NF }'` local group_exists="`grep "^$groupname:" $rootdir/etc/group || true`" if test "x$group_exists" != "x"; then - eval flock -x -w 100 $rootdir${sysconfdir} -c \'$PSEUDO groupdel $opts\' || true + eval flock -x $rootdir${sysconfdir} -c \"$PSEUDO groupdel \$opts\" || true group_exists="`grep "^$groupname:" $rootdir/etc/group || true`" if test "x$group_exists" != "x"; then bbfatal "${PN}: groupdel command did not succeed." @@ -101,7 +87,7 @@ perform_userdel () { local username=`echo "$opts" | awk '{ print $NF }'` local user_exists="`grep "^$username:" $rootdir/etc/passwd || true`" if test "x$user_exists" != "x"; then - eval flock -x -w 100 $rootdir${sysconfdir} -c \'$PSEUDO userdel $opts\' || true + eval flock -x $rootdir${sysconfdir} -c \"$PSEUDO userdel \$opts\" || true user_exists="`grep "^$username:" $rootdir/etc/passwd || true`" if test "x$user_exists" != "x"; then bbfatal "${PN}: userdel command did not succeed." @@ -121,7 +107,7 @@ perform_groupmod () { local groupname=`echo "$opts" | awk '{ print $NF }'` local group_exists="`grep "^$groupname:" $rootdir/etc/group || true`" if test "x$group_exists" != "x"; then - eval flock -x -w 100 $rootdir${sysconfdir} -c \'$PSEUDO groupmod $opts\' + eval flock -x $rootdir${sysconfdir} -c \"$PSEUDO groupmod \$opts\" if test $? != 0; then bbwarn "${PN}: groupmod command did not succeed." fi @@ -140,7 +126,7 @@ perform_usermod () { local username=`echo "$opts" | awk '{ print $NF }'` local user_exists="`grep "^$username:" $rootdir/etc/passwd || true`" if test "x$user_exists" != "x"; then - eval flock -x -w 100 $rootdir${sysconfdir} -c \'$PSEUDO usermod $opts\' + eval flock -x $rootdir${sysconfdir} -c \"$PSEUDO usermod \$opts\" if test $? != 0; then bbfatal "${PN}: usermod command did not succeed." fi |