X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F21-usersetup;h=375b52d25a20bf1721165988d0f66160ff71985f;hb=17e7145abf34730eff02a38246213f018e4dd265;hp=d95f5d0ee0aa54c43dc771e5b953de4cd114da31;hpb=03565b5ad46ce7b5e091602561fcb148f64303f4;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 d95f5d0..375b52d 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup
@@ -1,17 +1,17 @@
-#!/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
 set -e
 
 USERNAME=''
-[ -r /etc/grml/grml-live.conf ] && . /etc/grml/grml-live.conf
+[ -r /etc/grml/grml-live.conf ]  && . /etc/grml/grml-live.conf
+[ -r /etc/grml/grml-live.local ] && . /etc/grml/grml-live.local
 [ -n "$USERNAME" ] || USERNAME=grml
 
 if grep -q "$USERNAME:x:1000" $target/etc/group ; then
@@ -39,7 +39,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 $1 $USERNAME
+      grep "$1:x:.*$USERNAME" $target/etc/group || $ROOTCMD addgroup $USERNAME $1
    fi
 }
 
@@ -53,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
@@ -67,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
+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