Fix usage of $USERNAME in 20-sudo + 21-usersetup

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/20-sudo b/etc/grml/fai/config/scripts/GRMLBASE/20-sudo
index 8595bf1..a25a4d3 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/20-sudo
+++ b/etc/grml/fai/config/scripts/GRMLBASE/20-sudo
@@ -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: Sun Sep 16 23:12:25 CEST 2007 [mika]
+# Latest change: Mon Sep 17 14:14:36 CEST 2007 [mika]
 ################################################################################
 
 set -u
@@ -16,6 +16,7 @@ USERNAME=''
 
 if [ -r /etc/grml/fai/files/etc/sudoers ] ; then
    cp /etc/grml/fai/files/etc/sudoers $target/etc/sudoers
+   sed -i "s/^USERNAME/$USERNAME/" $target/etc/sudoers
    chmod 440 $target/etc/sudoers
 fi
 

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup b/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup
index 28a40d3..4746b87 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup
@@ -1,10 +1,10 @@
-#!/bin/sh
+#/bin/sh
 # Filename:      /etc/grml/fai/config/scripts/GRML/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: Sun Sep 16 22:58:45 CEST 2007 [mika]
+# Latest change: Mon Sep 17 15:12:21 CEST 2007 [mika]
 ################################################################################
 
 set -u
@@ -18,7 +18,7 @@ $ROOTCMD addgroup --gid 1000 $USERNAME
 $ROOTCMD useradd -d /home/$USERNAME -m -s /bin/zsh -g 1000 $USERNAME
 
 sed -i 's/^root::/root:*:/' $target/etc/shadow
-sed -i 's/^$USERNAME::/$USERNAME:*:/' $target/etc/shadow
+sed -i "s/^$USERNAME::/$USERNAME:*:/" $target/etc/shadow
 
 $ROOTCMD chsh -s /bin/zsh root
 $ROOTCMD chsh -s /bin/zsh $USERNAME