X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F20-sudo;h=22c07cbdba79728bcf2576b1008c6d851f72450c;hp=a25a4d3a0a571018ef14ecf9bfb7c2d49ed344c1;hb=4b2e8632eba4fa2343986f897cfcd59ed1413d66;hpb=688558e0caad63c7d2b7053ff7522d4901568342

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/20-sudo b/etc/grml/fai/config/scripts/GRMLBASE/20-sudo
index a25a4d3..22c07cb 100755
--- 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
+#!/bin/bash
+# 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