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

[grml-live.git] / etc / grml / fai / config / scripts / GRMLBASE / 33-aptsetup

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
index 0750201..e4922a9 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
@@ -1,31 +1,26 @@
-#!/bin/sh
-# Filename:      /etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
+#!/bin/bash
+# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/33-aptsetup
 # Purpose:       configure Debian package management of 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.
 ################################################################################
 
+set -u
 set -e
 
-if [ -L "$target"/etc/apt/sources.list ] ; then
-   echo "Note: $target/etc/apt/sources.list seems to be the old sources.list setup."
-   echo "|->   Not modifying anything. If you want to switch to the new setup just"
-   echo "\`->   remove symlink $target/etc/apt/sources.list"
-   exit 0
-fi
-
-# remove leftover from /etc/grml/fai/config/hooks/instsoft.GRMLBASE:
-rm -f $target/etc/apt/sources.list.d/grml-live.list
-
-# restore original grml sources.list file:
-if [ -r $target/etc/apt/sources.list.d/grml.unused ] ; then
-   mv $target/etc/apt/sources.list.d/grml.unused $target/etc/apt/sources.list.d/grml.list
-fi
-
 GRML_SOURCES_LIST="$target/etc/apt/sources.list.d/grml.list"
 DEBIAN_SOURCES_LIST="$target/etc/apt/sources.list.d/debian.list"
 
+# restore original grml sources.list file (temporarly moved via
+# /etc/grml/fai/config/hooks/instsoft.GRMLBASE):
+if [ -r "${GRML_SOURCES_LIST}.unused" ] ; then
+   mv "${GRML_SOURCES_LIST}.unused" "${GRML_SOURCES_LIST}"
+fi
+if [ -r "${DEBIAN_SOURCES_LIST}.unused" ] ; then
+   mv "${DEBIAN_SOURCES_LIST}.unused" "${DEBIAN_SOURCES_LIST}"
+fi
+
 [ -d $target/etc/apt/sources.list.d ] || mkdir $target/etc/apt/sources.list.d
 
 # remove any existing sources.list and inform user about the new
@@ -101,4 +96,4 @@ EOF
 fi
 
 ## 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