Temporarly move /etc/apt/sources.list.d/grml.list in instsoft.GRMLBASE

[grml-live.git] / etc / grml / fai / config / hooks / instsoft.GRMLBASE

diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index 477e646..df99f5b 100755 (executable)
--- 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,
@@ -69,12 +72,12 @@ EOF
 
    if [ -x $target/usr/bin/aptitude ] ; then
       if $ROOTCMD aptitude --help | grep -q safe-upgrade ; then
-         $ROOTCMD aptitude -y safe-upgrade
+         APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none $ROOTCMD aptitude -y safe-upgrade
       else
-         $ROOTCMD aptitude -y upgrade
+         APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none $ROOTCMD aptitude -y upgrade
       fi
    else
-      $ROOTCMD apt-get -y upgrade
+      APT_LISTCHANGES_FRONTEND=none APT_LISTBUGS_FRONTEND=none $ROOTCMD apt-get -y upgrade
    fi
 
 else # no softupdate but fresh installation
@@ -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: