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,
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:
+fcopy -r /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
-# install all present (but at least the grml) gpg keys:
-if [ -r /etc/grml/fai/files/etc/apt/grml.key ] ; then
- for file in /etc/grml/fai/files/etc/apt/*.key ; do
- FILE="$(basename $file)"
- # installed via 'cp -a /etc/grml/fai/files/etc/apt/* $target/etc/apt/' above already
- # cp $file $target/etc/apt/"$FILE"
- $ROOTCMD apt-key add /etc/apt/"$FILE"
- done
-else
- gpg --keyserver subkeys.pgp.net --recv-keys F61E2E7CECDEA787 || \
- gpg --keyserver blackhole.pca.dfn.de --recv-keys F61E2E7CECDEA787
- gpg --export F61E2E7CECDEA787 > $target/etc/apt/grml.key
- $ROOTCMD apt-key add /etc/apt/grml.key
-fi
+# install grml gpg key:
+fcopy /etc/apt/grml.key
+$ROOTCMD apt-key add /etc/apt/grml.key
+# gpg --keyserver subkeys.pgp.net --recv-keys F61E2E7CECDEA787 || \
+# gpg --keyserver blackhole.pca.dfn.de --recv-keys F61E2E7CECDEA787
+# gpg --export F61E2E7CECDEA787 > $target/etc/apt/grml.key
+# $ROOTCMD apt-key add /etc/apt/grml.key
# make sure the file exists
[ -e $target/etc/apt/apt.conf ] || touch $target/etc/apt/apt.conf
# 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: