X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F21-usersetup;h=277864254ab8465b59d2cebb47b60e209e19a1dc;hb=06cec9aaad60a380b76958916c9f5357013ea010;hp=8686b87e2e9ea13dbf68ab395c70936ed557645b;hpb=bc3fb695369f16a11cbbb6ab57bd7d6898fe6f52;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 8686b87..2778642 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
-# Latest change: Thu Oct 18 14:28:53 CEST 2007 [mika]
+# Latest change: Fri Oct 26 01:22:30 CEST 2007 [mika]
 ################################################################################
 
 set -u
@@ -19,13 +19,12 @@ if grep -q "$USERNAME:x:1000" $target/etc/group ; then
 else
   if grep -q 'gsmsms:x:1000' $target/etc/group ; then
      echo 'Bug #353967 detected, fixing GUID = 1000 setup for you'
-     $ROOTCMD delgroup gsmsms
-     $ROOTCMD deluser gsmsms
-     $ROOTCMD addgroup --gid 1000 $USERNAME
-     $ROOTCMD addgroup --system gsmsms
+     $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
-     $ROOTCMD adduser gsmsms dialout
+                      --no-create-home --home /var/spool/sms gsmsms || /bin/true
+     $ROOTCMD adduser gsmsms dialout || /bin/true
   fi
   $ROOTCMD addgroup --gid 1000 $USERNAME
 fi
@@ -39,8 +38,10 @@ fi
 sed -i 's/^root::/root:*:/'            $target/etc/shadow
 sed -i "s/^$USERNAME:!:/$USERNAME:*:/" $target/etc/shadow
 
-$ROOTCMD chsh -s /bin/zsh root
-$ROOTCMD chsh -s /bin/zsh $USERNAME
+if [ -r $target/bin/zsh ] ; then
+   $ROOTCMD chsh -s /bin/zsh root
+   $ROOTCMD chsh -s /bin/zsh $USERNAME
+fi
 
 ## END OF FILE #################################################################
 # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3