Implement -D option to set configuration directory; fai.conf: don't set variables...

[grml-live.git] / etc / grml / fai / config / scripts / GRMLBASE / 99-finish-grml-build

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build b/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build
index da74934..0f1b9d6 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build
+++ b/etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Filename:      /etc/grml/fai/config/scripts/GRMLBASE/99-finish-grml-build
+# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/99-finish-grml-build
 # Purpose:       finalize grml chroot build
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
@@ -9,11 +9,6 @@
 set -u
 set -e
 
-# Restore usual Debian behaviour
-#if [ -r "$target"/etc/apt/apt.conf.d/15grml-live ] ; then
-#   rm -f "$target"/etc/apt/apt.conf.d/15grml-live
-#fi
-
 # Restore original state from softupdate:
 if [ -r $target/etc/policy-rc.d.conf ] ; then
    sed -i "s/EXITSTATUS='101'/EXITSTATUS='0'/" $target/etc/policy-rc.d.conf
@@ -28,4 +23,4 @@ fi
 touch $target/etc/grml_cd
 
 ## 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