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

[grml-live.git] / etc / grml / fai / config / scripts / GRMLBASE / 97-apt-listchanges

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/97-apt-listchanges b/etc/grml/fai/config/scripts/GRMLBASE/97-apt-listchanges
index fe7c9c2..02372db 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/97-apt-listchanges
+++ b/etc/grml/fai/config/scripts/GRMLBASE/97-apt-listchanges
@@ -1,11 +1,12 @@
 #!/bin/bash
-# Filename:      /etc/grml/fai/config/scripts/GRMLBASE/97-apt-listchanges
+# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/97-apt-listchanges
 # Purpose:       configure apt-listchanges
 # 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.
 ################################################################################
 
+set -u
 set -e
 
 # Defaults:
@@ -16,14 +17,14 @@ set -e
 #apt-listchanges apt-listchanges/save-seen       boolean true
 
 if [ -x $target/usr/bin/apt-listchanges ] ; then
-   echo 'apt-listchanges apt-listchanges/confirm boolean true' | $ROOTCMD debconf-set-selections
-   echo 'apt-listchanges apt-listchanges/which   select  both' | $ROOTCMD debconf-set-selections
-
+  echo 'apt-listchanges apt-listchanges/confirm boolean true' | $ROOTCMD debconf-set-selections
+  echo 'apt-listchanges apt-listchanges/which   select  both' | $ROOTCMD debconf-set-selections
 fi
 
 if [ -r $target/etc/apt/listchanges.conf ] ; then
-   sed -i "s/^which=news/which=both/" $target/etc/apt/listchanges.conf
-   sed -i "s/^confirm=0/confirm=1/"   $target/etc/apt/listchanges.conf
+  sed -i "s/^which=news/which=both/" $target/etc/apt/listchanges.conf
+  sed -i "s/^confirm=0/confirm=1/"   $target/etc/apt/listchanges.conf
 fi
 
 ## END OF FILE #################################################################
+# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2