Some updates for 20-sudo, 21-usersetup and drop resolv.conf handling in cleanup script

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/20-sudo b/etc/grml/fai/config/scripts/GRMLBASE/20-sudo
index a25a4d3..54f85b6 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/20-sudo
+++ b/etc/grml/fai/config/scripts/GRMLBASE/20-sudo
@@ -16,7 +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
+   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 ba46d1c..fc71e2f 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/21-usersetup
@@ -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

diff --git a/etc/grml/fai/grml/grml_cleanup_chroot b/etc/grml/fai/grml/grml_cleanup_chroot
index 0a1ace0..213ee00 100755 (executable)
--- a/etc/grml/fai/grml/grml_cleanup_chroot
+++ b/etc/grml/fai/grml/grml_cleanup_chroot
@@ -307,8 +307,7 @@ einfo "Cleaning and removing some misc files and directories"
          /var/run/*/* /var/run/* /var/log/ksymoops/* /var/lock/*/* /var/lock/*    \
          /var/state/*/* /var/state/* /var/log/nessus/*                            \
          /halt /reboot /ash.static /etc/dhcpc/*.info /etc/dhcpc/resolv*           \
-         /etc/resolv.conf /etc/*passwd- /etc/*shadow- /etc/*group-                \
-         /var/spool/postfix/maildrop/*                                            \
+         /etc/*passwd- /etc/*shadow- /etc/*group- /var/spool/postfix/maildrop/*   \
          /etc/lvm/.cache 2>/dev/null
   rm -rf /tmp/* /var/tmp/* /var/tmp/.* /var/backups/* /.ssh /root/.ssh /home/*/.ssh \
          /home/grml/* /home/grml/.??* /var/lib/texmf/ls-R  /var/spool/texmf/ls-R    \
@@ -324,29 +323,6 @@ einfo "Cleaning and removing some misc files and directories"
   :>/var/run/wtmp
 eend $?
 
-einfo "Setting up /etc/resolv.conf"
-  if [ -d /etc/dhcpc ] ; then
-    cat >/etc/dhcpc/resolv.conf <<EOT
-# insert nameservers here
-# nameserver 127.0.0.1
-EOT
-    chmod 644 /etc/dhcpc/resolv.conf
-  else
-    cat >/etc/resolv.conf <<EOT
-# insert nameservers here
-# nameserver 127.0.0.1
-EOT
-    chmod 644 /etc/resolv.conf
-  fi
-
-   # is resolvconf available?
-   if [ -r /etc/resolvconf/run/resolv.conf ] ; then
-      ln -sf /etc/resolvconf/run/resolv.conf /etc/
-   else
-      ln -s /etc/dhcpc/resolv.conf /etc/
-   fi
-eend $?
-
 if [ -x /usr/sbin/update-ca-certificates ] ; then
   einfo "Updating ca-certificates"
   update-ca-certificates 1>/dev/null