X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Fupdatebase.GRMLBASE;h=a50168239cea6a02dbdda4754f1e2ed029000265;hb=fa0267faa8f5b87ceb9f1bec70fa81347ee51b55;hp=0c46d0032300e837a3b1f69bb84049f7614d87a5;hpb=8795132e3cc5937788a27947d2af7aa9881dcec3;p=grml-live.git diff --git a/etc/grml/fai/config/hooks/updatebase.GRMLBASE b/etc/grml/fai/config/hooks/updatebase.GRMLBASE index 0c46d00..a501682 100755 --- a/etc/grml/fai/config/hooks/updatebase.GRMLBASE +++ b/etc/grml/fai/config/hooks/updatebase.GRMLBASE @@ -24,6 +24,33 @@ EOF # skip the task if we want to build a new ISO only: [ -n "$BUILD_ONLY" ] && skiptask instsoft || /bin/true + +else # no softupdate but updating chroot based on /etc/grml/fai/config/basefiles/* + +# 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: +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 + fi ## END OF FILE #################################################################