From 10690a93c8cfddf92ee4d6ab17015b293b0e3709 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@grml.org>
Date: Wed, 1 Aug 2012 19:20:28 +0200
Subject: [PATCH] Debian ISOs do not contain signed Release files

pass --no-check-gpg to debootstrap
pass --allow-untrusted to aptitude
---
 chroot-script    | 10 ++++++++--
 grml-debootstrap |  6 ++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/chroot-script b/chroot-script
index 7caf4dd..98e7b14 100755
--- a/chroot-script
+++ b/chroot-script
@@ -18,9 +18,15 @@
 
 # use aptitude only if it's available
 if [ -x /usr/bin/aptitude ] ; then
-   APTINSTALL="aptitude -y --without-recommends install $DPKG_OPTIONS"
    APTUPDATE='aptitude update'
-   APTUPGRADE='aptitude -y safe-upgrade'
+   # Debian ISOs do not contain signed Release files
+   if [ -n "$ISO" ] ; then
+      APTINSTALL="aptitude -y --allow-untrusted --without-recommends install $DPKG_OPTIONS"
+      APTUPGRADE='aptitude -y --allow-untrusted safe-upgrade'
+   else
+      APTINSTALL="aptitude -y --without-recommends install $DPKG_OPTIONS"
+      APTUPGRADE='aptitude -y safe-upgrade'
+   fi
 else
    APTINSTALL="apt-get --force-yes -y --no-install-recommends install $DPKG_OPTIONS"
    APTUPDATE='apt-get update'
diff --git a/grml-debootstrap b/grml-debootstrap
index 0aad703..3085637 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -853,6 +853,12 @@ ISODIR=${ISO##file:}
 ISODIR=${ISODIR%%/}
 # }}}
 
+# Debian ISOs do not contain signed Release files {{{
+if [ -n "$ISO" ] ; then
+    DEBOOTSTRAP_OPT="$DEBOOTSTRAP_OPT --no-check-gpg"
+fi
+# }}}
+
 # create filesystem {{{
 mkfs() {
   if [ -n "$DIRECTORY" ] ; then
-- 
2.1.4