X-Git-Url: http://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F21-usersetup;h=6ca33c7343fbf3f88a2949b448470e49e35ba381;hp=321451162ca62fd7e3be9accd5b3094d4535a606;hb=f3b335ea5c94d5cf24ec6b9184106b298849f311;hpb=ff079cd77f0e36d5d754b800a75f1e011769e8ec

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup b/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup
index 3214511..6ca33c7 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup
@@ -1,10 +1,9 @@
-#!/bin/sh
-# Filename:      /etc/grml/fai/config/scripts/GRMLBASE/21-usersetup
+#!/bin/bash
+# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/21-usersetup
 # Purpose:       adjust user setup of the live-system
 # 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 Nov 15 09:42:42 CET 2007 [mika]
 ################################################################################
 
 set -u
@@ -54,6 +53,7 @@ add_user_to_group floppy
 add_user_to_group fuse
 add_user_to_group games
 add_user_to_group nvram
+add_user_to_group netdev
 add_user_to_group plugdev
 add_user_to_group scanner
 add_user_to_group sudo
@@ -68,10 +68,16 @@ add_user_to_group voice
 sed -i 's/^root::/root:*:/'            $target/etc/shadow
 sed -i "s/^$USERNAME:!:/$USERNAME:*:/" $target/etc/shadow
 
+# make sure users can log in on consoles 4, 5 and 6 if username != grml:
+if [ "$USERNAME" != "grml" ] ; then
+   sed -i "s/-u grml -g grml --autologin grml/-u ${USERNAME} -g ${USERNAME} --autologin ${USERNAME}/" \
+   $target/etc/inittab.grml
+fi
+
 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
+# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2