X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Fupdatebase.GRMLBASE;h=c50877fb81d5957d5d85af5aadd11cccc025c00a;hb=1a823a1c53bdc752825296024fcabe2988b40fc1;hp=e1633b36ef57d1c336c436de73424931ce64b51a;hpb=2203377a037512efaf959d67c5abf800a8cfe6bc;p=grml-live.git

diff --git a/etc/grml/fai/config/hooks/updatebase.GRMLBASE b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
index e1633b3..c50877f 100755
--- a/etc/grml/fai/config/hooks/updatebase.GRMLBASE
+++ b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
@@ -67,10 +67,24 @@ if ! [ -e ${target}/etc/udev/kernel-upgrade ] ; then
 fi
 
 # install all apt related files
-fcopy -B -v -r /etc/apt
+fcopy -i -B -v -r /etc/apt
 
-# install Grml gpg key:
-$ROOTCMD apt-key add /etc/apt/grml.key
+# install packages from a repository of a specific date
+if [ -n "${WAYBACK_DATE:-}" ] ; then
+  echo "Wayback date '$WAYBACK_DATE' identified, enabling for snapshot.debian.org usage."
+
+  perl -pi -e "s#^(\s+)(deb.* )(.*://ftp.debian.org.*?)\s+([a-z-]+)\s+(.*)\$#\$1\$2 [check-valid-until=no] http://snapshot.debian.org/archive/debian/$WAYBACK_DATE/ \$4 \$5#" \
+    "${target}/etc/apt/sources.list.d/debian.list"
+
+  perl -pi -e "s#^(\s+)(deb.* )(.*://security.debian.org.*?)\s+([a-z-/]+)\s+(.*)\$#\$1\$2 [check-valid-until=no] http://snapshot.debian.org/archive/debian-security/$WAYBACK_DATE/ \$4 \$5#" \
+    "${target}/etc/apt/sources.list.d/debian.list"
+fi
+
+if ! $ROOTCMD test -x /usr/bin/aptitude ; then
+  echo "aptitude binary is not available, installing to make sure further FAI actions continue to work"
+  $ROOTCMD apt-get update
+  $ROOTCMD apt-get -y install aptitude
+fi
 
 ## END OF FILE #################################################################
 # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2