X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Finstsoft.GRMLBASE;h=df99f5b6587907dfba705fea04400e40fc730fb4;hp=d0a09f72ba00a527e3fe3bd2dc07c6079f7989de;hb=961a5ebdae6d44584eba0d413f6541838865aead;hpb=e97a5d7afe24d326bae906fe1637e2f0cfd09065

diff --git a/etc/grml/fai/config/hooks/instsoft.GRMLBASE b/etc/grml/fai/config/hooks/instsoft.GRMLBASE
index d0a09f7..df99f5b 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,
@@ -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
@@ -82,6 +85,10 @@ else # no softupdate but fresh installation
 # install all apt related files
 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:
+   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:
@@ -99,6 +106,9 @@ else
    $ROOTCMD apt-key add /etc/apt/grml.key
 fi
 
+# make sure the file exists
+[ -e $target/etc/apt/apt.conf ] || touch $target/etc/apt/apt.conf
+
 # work around http://trac.lighttpd.net/trac/ticket/657
 if ! grep -q 'Acquire::http::Pipeline-Depth.*0' $target/etc/apt/apt.conf ; then
    echo "Acquire::http::Pipeline-Depth 0; // added by grml-live" >> $target/etc/apt/apt.conf
@@ -119,10 +129,6 @@ fi
 $ROOTCMD apt-get update
 $ROOTCMD aptitude -f -y install file-rc
 
-# Workaround #443481 of snort for Debian/etch:
-mkdir -p $target/etc/snort
-echo 'LOGDIR=/var/log/snort' >> $target/etc/snort/snort.common.parameters
-
 # we definitely don't want to fail running fai dirinstall just
 # because of some well known bugs:
 [ -d $target/etc/apt/apt.conf.d ] || mkdir $target/etc/apt/apt.conf.d