From: Michael Prokop <mika@grml.org>
Date: Thu, 28 Jul 2022 08:54:18 +0000 (+0200)
Subject: GRMLBASE/21-usersetup: use adduser for adding user to group
X-Git-Tag: v0.40.3~1
X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=f131526449838a2a8044069ce66e0cb806cbe0fd

GRMLBASE/21-usersetup: use adduser for adding user to group

adduser >=3.122 no longer supports adding a user to a group via its
addgroup binary (see
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=664869), so let's
invoke adduser instead.

Closes: https://github.com/grml/grml-live/issues/115
---

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup b/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup
index bc09c1f..50d43e6 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup
@@ -26,7 +26,7 @@ fi
 add_user_to_group() {
    [ -n "$1" ] || return 1
    if grep -q $1 $target/etc/group ; then
-      grep "$1:x:.*$USERNAME" $target/etc/group || $ROOTCMD addgroup $USERNAME $1
+      grep "$1:x:.*$USERNAME" $target/etc/group || $ROOTCMD adduser $USERNAME $1
    fi
 }