sed -i "s/EXITSTATUS=.*/EXITSTATUS='101'/" $target/etc/policy-rc.d.conf
fi
- # make sure we prefer grml repository:
- if [ -r /etc/grml/fai/apt/preferences ] ; then
- cp /etc/grml/fai/apt/preferences $target/etc/apt/preferences
- fi
-
# we definitely don't want to fail running fai sofupdate just
# because of some well known bugs:
[ -d $target/etc/apt/apt.conf.d ] || mkdir $target/etc/apt/apt.conf.d
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:
+ 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
+
+# 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
-# should be removed later on:
-echo "Acquire::http::Pipeline-Depth "0"; // added by grml-live" >> $target/etc/apt/apt.conf
+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
+fi
# Recommends just pull in way tooooo much packages, so disable it:
-echo "APT::Install-Recommends "false"; // added by grml-live" >> $target/etc/apt/apt.conf
-# Notice: deprecated since aptitude (0.4.11-1):
-echo "Aptitude::Recommends-Important "false"; // added by grml-live" >> $target/etc/apt/apt.conf
-
-# install grml keys:
-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 we prefer grml repository:
-if [ -r /etc/grml/fai/files/etc/apt/preferences ] ; then
- cp /etc/grml/fai/apt/preferences $target/etc/apt/preferences
+if ! grep -q 'APT::Install-Recommends.*false' $target/etc/apt/apt.conf ; then
+ echo "APT::Install-Recommends false; // added by grml-live" >> $target/etc/apt/apt.conf
+fi
+
+# Notice: deprecated with aptitude (0.4.11-1):
+if ! grep -q 'Aptitude::Recommends-Important.*false' $target/etc/apt/apt.conf ; then
+ echo "Aptitude::Recommends-Important false; // added by grml-live" >> $target/etc/apt/apt.conf
fi
# make sure we have file-rc available before