From: Michael Prokop <mika@grml.org>
Date: Thu, 7 Jan 2016 10:37:41 +0000 (+0100)
Subject: Use "[check-valid-until=no]" in wayback option
X-Git-Tag: v0.28.0~41
X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=4aa8458ca4e79ec886f0b8f412f726dd7aa9e735

Use "[check-valid-until=no]" in wayback option

Ensure that apt doesn't complain about invalid repositories.

NOTE: supported only by apt >= 1.1~
---

diff --git a/etc/grml/fai/config/hooks/updatebase.GRMLBASE b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
index 93f4428..7255a2f 100755
--- a/etc/grml/fai/config/hooks/updatebase.GRMLBASE
+++ b/etc/grml/fai/config/hooks/updatebase.GRMLBASE
@@ -73,10 +73,10 @@ 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