rootfs-postcommands: amend systemd_create_users add user to group check

Currently when adding a user to a group ('m' type), the conditional
check to only create a user/group if it does not exist always resolves
to true. This causes a build exit failure if the user and/or group
defined in the sysusers configuration file were already created prior to
the execution of systemd_create_users().

This logic has been updated to instead fail silently (consistent with
'u' and 'g' type). Additionally, if a user doesn't exist it will be
created without the default group.

Signed-off-by: Tean Cunningham <tean.cunningham@digi.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 65649be6b2196ab964c69605d0306bfc2481da33)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>

diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass
index 74035c30b709883d25ca8ea7724754234006b737..0452fe4b2784723611f16b3487c149bf8336237d 100644 (file)
--- a/meta/classes/rootfs-postcommands.bbclass
+++ b/meta/classes/rootfs-postcommands.bbclass
@@ -78,12 +78,8 @@ systemd_create_users () {
                        eval groupadd --root ${IMAGE_ROOTFS} $groupadd_params || true
                elif [ "$type" = "m" ]; then
                        group=$id
-                       if [ ! `grep -q "^${group}:" ${IMAGE_ROOTFS}${sysconfdir}/group` ]; then
-                               eval groupadd --root ${IMAGE_ROOTFS} --system $group
-                       fi
-                       if [ ! `grep -q "^${name}:" ${IMAGE_ROOTFS}${sysconfdir}/passwd` ]; then
-                               eval useradd --root ${IMAGE_ROOTFS} --shell /sbin/nologin --system $name
-                       fi
+                       eval groupadd --root ${IMAGE_ROOTFS} --system $group || true
+                       eval useradd --root ${IMAGE_ROOTFS} --shell /sbin/nologin --system $name --no-user-group || true
                        eval usermod --root ${IMAGE_ROOTFS} -a -G $group $name
                fi
                done