fi
# FAI softupdate executes upgrade only with the sources.list being
- # present in the chroot :-/ - so let's do it on our own:
+ # present in the chroot - so let's do it on our own:
if [ -r /etc/grml/fai/apt/sources.list ] ; then
if [ -L $target/etc/apt/sources.list ] ; then
rm $target/etc/apt/sources.list
fi
+
+ # install grml-live's (on the fly adjusted) sources.list config
cp /etc/grml/fai/apt/sources.list $target/etc/apt/sources.list.d/grml-live.list
+
+ # when re-running grml-live with the -u option we do not want to use the
+ # sources.list config of the live system but grml-live's config instead,
+ # therefore temporarly move known files and restore them again later on
+ # through /etc/grml/fai/config/scripts/GRMLBASE/33-aptsetup:
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
+ if [ -r $target/etc/apt/sources.list.d/debian.list ] ; then
+ mv $target/etc/apt/sources.list.d/debian.list $target/etc/apt/sources.list.d/debian.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:
- 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
+fcopy -r /etc/apt
-# 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
+# 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 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