X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fhooks%2Fupdatebase.GRMLBASE;h=65881267e2373c3f11e6b577341148d4c38507bd;hp=93f4428a2c776b9db20cde03e96b6cd7909cbaba;hb=HEAD;hpb=7380bbc4746d542bf866249e60b191e13391d0ad

diff --git a/etc/grml/fai/config/hooks/updatebase.GRMLBASE b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
index 93f4428..6588126 100755
--- a/etc/grml/fai/config/hooks/updatebase.GRMLBASE
+++ b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
@@ -73,21 +73,12 @@ fcopy -i -B -v -r /etc/apt
 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\$2http://snapshot.debian.org/archive/debian/$WAYBACK_DATE/ \$4 \$5#" \
+  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\$2http://snapshot.debian.org/archive/debian-security/$WAYBACK_DATE/ \$4 \$5#" \
+  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
 
-# install Grml gpg key:
-$ROOTCMD apt-key add /etc/apt/grml.key
-
-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