X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F21-usersetup;h=123e39cbeacf203aeaf682de115aa4489c4207fc;hb=c701eefdfc1608c1655defece1c2e3f8ff5cde66;hp=29cf07ec15ccff5899d3f0780f1793bc5b80107c;hpb=352c82226ec5489438b7066db702fb31aa5c68a3;p=grml-live.git

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup b/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup
index 29cf07e..123e39c 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup
@@ -8,24 +8,11 @@
 
 set -u
 set -e
-
-USERNAME=''
-[ -r /etc/grml/grml-live.conf ]  && . /etc/grml/grml-live.conf
-[ -n "$GRML_LIVE_LOCAL_CONFIG" ] && . "$GRML_LIVE_LOCAL_CONFIG"
-[ -n "$USERNAME" ] || USERNAME=grml
+. "$GRML_LIVE_CONFIG"
 
 if grep -q "$USERNAME:x:1000" $target/etc/group ; then
    echo "group $USERNAME exists already, skipping"
 else
-  if grep -q 'gsmsms:x:1000' $target/etc/group ; then
-     echo 'Bug #353967 detected, fixing GUID = 1000 setup for you'
-     $ROOTCMD delgroup gsmsms || /bin/true
-     $ROOTCMD deluser gsmsms  || /bin/true
-     $ROOTCMD addgroup --system gsmsms || /bin/true
-     $ROOTCMD adduser --system --ingroup gsmsms \
-                      --no-create-home --home /var/spool/sms gsmsms || /bin/true
-     $ROOTCMD adduser gsmsms dialout || /bin/true
-  fi
   $ROOTCMD addgroup --gid 1000 $USERNAME
 fi