Rename /etc/grml/fai/files to /etc/grml/fai/config/files and move /etc/grml/fai/live...

[grml-live.git] / etc / grml / fai / config / scripts / GRMLBASE / 20-sudo

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/20-sudo b/etc/grml/fai/config/scripts/GRMLBASE/20-sudo
index 54f85b6..d940103 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/20-sudo
+++ b/etc/grml/fai/config/scripts/GRMLBASE/20-sudo
@@ -1,24 +1,22 @@
 #!/bin/sh
-# Filename:      /etc/grml/fai/config/scripts/GRML/20-sudo
+# Filename:      /etc/grml/fai/config/scripts/GRMLBASE/20-sudo
 # Purpose:       configure sudo 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: Mon Sep 17 14:14:36 CEST 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 [ -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
+fcopy /etc/sudoers
+sed -i "s/\$USERNAME/$USERNAME/" $target/etc/sudoers
+chmod 440 $target/etc/sudoers
 
 ## END OF FILE #################################################################
 # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3