Release new version 0.86

[grml-debootstrap.git] / chroot-script

diff --git a/chroot-script b/chroot-script
index 766a59d..90d3f23 100755 (executable)
--- a/chroot-script
+++ b/chroot-script
@@ -192,29 +192,15 @@ EOF
 }
 # }}}
 
-# check available backports release version {{{
-checkbackports() {
-  wget -q -O/dev/null "http://backports.debian.org/debian-backports/dists/${1}-backports/Release"
-}
-# }}}
-
 # feature to provide Debian backports repos {{{
 backportrepos() {
-    if [ -n "$BACKPORTREPOS" ] ; then
-        if ! checkbackports "$RELEASE" ; then
-            echo "Backports for ${RELEASE} are not available." >&2
-            exit 1
-        else
-            # user might have provided their own apt sources.list
-            if ! grep -q backports /etc/apt/sources.list.d/backports.list 2>/dev/null ; then
-                cat >> /etc/apt/sources.list.d/backports.list << EOF
+  if [ -n "$BACKPORTREPOS" ] ; then
+    cat >> /etc/apt/sources.list.d/backports.list << EOF
 # debian backports: ${RELEASE}-backports repository:
-deb     http://backports.debian.org/debian-backports ${RELEASE}-backports main
-deb-src http://backports.debian.org/debian-backports ${RELEASE}-backports main
+deb     ${MIRROR} ${RELEASE}-backports main
+deb-src ${MIRROR} ${RELEASE}-backports main
 EOF
-            fi
-        fi
-    fi
+  fi
 }
 # }}}
 
@@ -465,8 +451,12 @@ default_locales() {
 # adjust timezone {{{
 timezone() {
   if [ -n "$TIMEZONE" ] ; then
-     echo "Adjusting /etc/localtime"
-     ln -sf "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime
+    echo "Adjusting /etc/localtime"
+    ln -sf "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime
+
+    echo "Setting /etc/timezone to $TIMEZONE"
+    printf '%s\n' "$TIMEZONE"  > /etc/timezone
+
   fi
 }
 # }}}