summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorIoan-Adrian Ratiu <adrian.ratiu@ni.com>2017-01-23 20:09:23 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-26 10:44:27 +0000
commit6805ae0f2aa77b2719f382140c3ad562e767d21b (patch)
treef2f19bc7a4460433dd27c089cd86f2d397d15a15 /meta/classes
parent95cdd91a802d73b2e2de727535b584e9dce0424d (diff)
downloadpoky-6805ae0f2aa77b2719f382140c3ad562e767d21b.tar.gz
useradd_base: keep group if it still has users
perform_groupdel() tries to delete a group irrespective if other users have it as their primary group, thus the call to groupdel will fail with the following error error: groupdel: cannot remove the primary group of user '<user>' Add a check to perform_groupdel() to determine if there are other users and keep the group, printing a warning. This is called right after a user is deleted to delete it's group. If the last user is deleted, only then the group is also deleted. (From OE-Core rev: bba1f02cb6d80279c6fed34bb18f010aa921fc1e) Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/useradd_base.bbclass18
1 files changed, 14 insertions, 4 deletions
diff --git a/meta/classes/useradd_base.bbclass b/meta/classes/useradd_base.bbclass
index ba87edc57a..551c82c322 100644
--- a/meta/classes/useradd_base.bbclass
+++ b/meta/classes/useradd_base.bbclass
@@ -69,11 +69,21 @@ perform_groupdel () {
69 bbnote "${PN}: Performing groupdel with [$opts]" 69 bbnote "${PN}: Performing groupdel with [$opts]"
70 local groupname=`echo "$opts" | awk '{ print $NF }'` 70 local groupname=`echo "$opts" | awk '{ print $NF }'`
71 local group_exists="`grep "^$groupname:" $rootdir/etc/group || true`" 71 local group_exists="`grep "^$groupname:" $rootdir/etc/group || true`"
72
72 if test "x$group_exists" != "x"; then 73 if test "x$group_exists" != "x"; then
73 eval flock -x $rootdir${sysconfdir} -c \"$PSEUDO groupdel \$opts\" || true 74 local awk_input='BEGIN {FS=":"}; $1=="'$groupname'" { print $3 }'
74 group_exists="`grep "^$groupname:" $rootdir/etc/group || true`" 75 local groupid=`echo "$awk_input" | awk -f- $rootdir/etc/group`
75 if test "x$group_exists" != "x"; then 76 local awk_check_users='BEGIN {FS=":"}; $4=="'$groupid'" {print $1}'
76 bbfatal "${PN}: groupdel command did not succeed." 77 local other_users=`echo "$awk_check_users" | awk -f- $rootdir/etc/passwd`
78
79 if test "x$other_users" = "x"; then
80 eval flock -x $rootdir${sysconfdir} -c \"$PSEUDO groupdel \$opts\" || true
81 group_exists="`grep "^$groupname:" $rootdir/etc/group || true`"
82 if test "x$group_exists" != "x"; then
83 bbfatal "${PN}: groupdel command did not succeed."
84 fi
85 else
86 bbnote "${PN}: '$groupname' is primary group for users '$other_users', not removing it"
77 fi 87 fi
78 else 88 else
79 bbnote "${PN}: group $groupname doesn't exist, not removing it" 89 bbnote "${PN}: group $groupname doesn't exist, not removing it"