X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Finstsoft.GRMLBASE;h=b192b8a2f5c55535626424820c9a452a9d69b06b;hb=27a3d5320ebfddf05770d111faa90d83f04f5a4c;hp=4e94d66aea10d758c6663193a9d23604d44b872d;hpb=49903421197591ef183b274bd9401edb2d9fa0fb;p=grml-live.git

diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index 4e94d66..b192b8a 100755
--- a/etc/grml/fai/config/hooks/instsoft.GRMLBASE
+++ b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
@@ -57,7 +57,10 @@ EOF
       if [ -L $target/etc/apt/sources.list ] ; then
          rm $target/etc/apt/sources.list
       fi
-      cp /etc/grml/fai/apt/sources.list $target/etc/apt/sources.list
+      cp /etc/grml/fai/apt/sources.list $target/etc/apt/sources.list.d/grml-live.list
+      if [ -r  $target/etc/apt/sources.list.d/grml.list ] ; then
+         mv $target/etc/apt/sources.list.d/grml.list $target/etc/apt/sources.list.d/grml.unused
+      fi
    fi
 
    # run it on our own, as updatebase is used at the wrong stage for our needs,
@@ -83,7 +86,9 @@ else # no softupdate but fresh installation
 if [ -r /etc/grml/fai/files/etc/apt ] ; then
    cp -a /etc/grml/fai/files/etc/apt/* $target/etc/apt/
    # remove grml-live's sources.list file from chroot:
-   grep -q GRML_LIVE_SOURCES $target/etc/apt/important_note.txt && rm $target/etc/apt/important_note.txt
+   if [ -r $target/etc/apt/important_note.txt ] ; then
+      grep -q GRML_LIVE_SOURCES $target/etc/apt/important_note.txt && rm $target/etc/apt/important_note.txt
+   fi
 fi
 
 # install all present (but at least the grml) gpg keys:
@@ -122,7 +127,14 @@ fi
 # make sure we have file-rc available before
 # package_config/GRML is being executed:
 $ROOTCMD apt-get update
-$ROOTCMD aptitude -f -y install file-rc
+# newer aptitude versions won't remove essential packages using
+# 'aptitude -f -y install file-rc' anymore, therefore force it:
+$ROOTCMD aptitude -o Aptitude::ProblemResolver::Keep-All-Tier=60000 -f -y install file-rc
+
+# get rid of insserv:
+if $ROOTCMD dpkg --list insserv 2>/dev/null | grep -q '^ii' ; then
+   $ROOTCMD apt-get -y --purge remove insserv
+fi
 
 # we definitely don't want to fail running fai dirinstall just
 # because of some well known bugs: