Make all shell scripts using /bin/bash instead /bin/sh to be able to FAI's environment.

[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..002e000 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
+++ b/etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Filename:      /etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup
 # Purpose:       configure Debian package management of live-system
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
@@ -18,10 +18,14 @@ 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:
+# restore original grml sources.list file (temporarly moved via
+# /etc/grml/fai/config/hooks/instsoft.GRMLBASE):
 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
+if [ -r $target/etc/apt/sources.list.d/debian.unused ] ; then
+   mv $target/etc/apt/sources.list.d/debian.unused $target/etc/apt/sources.list.d/debian.list
+fi
 
 GRML_SOURCES_LIST="$target/etc/apt/sources.list.d/grml.list"
 DEBIAN_SOURCES_LIST="$target/etc/apt/sources.list.d/debian.list"