From d308c83e0a1ce46e514e5af5efb8a4b7abfaae99 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 29 May 2017 13:57:39 +0100
Subject: [PATCH] Change distro to stretch

---
 src/freedombone-addcert         | 2 +-
 src/freedombone-app-irc         | 2 +-
 src/freedombone-base-email      | 2 --
 src/freedombone-image-customise | 4 ++--
 src/freedombone-image-makefile  | 2 +-
 src/freedombone-utils-setup     | 2 +-
 src/freedombone-vars            | 2 +-
 7 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/freedombone-addcert b/src/freedombone-addcert
index acb853f3..286e35e4 100755
--- a/src/freedombone-addcert
+++ b/src/freedombone-addcert
@@ -222,7 +222,7 @@ function add_cert_letsencrypt {
     fi
 
     if [ ! -f /usr/bin/certbot ]; then
-        apt-get -yq install certbot -t jessie-backports
+        apt-get -yq install certbot
         if [ ! -f /usr/bin/certbot ]; then
             echo $'LetsEncrypt certbot failed to install'
             exit 762830
diff --git a/src/freedombone-app-irc b/src/freedombone-app-irc
index d5e9d2ed..ff0f1bce 100755
--- a/src/freedombone-app-irc
+++ b/src/freedombone-app-irc
@@ -613,7 +613,7 @@ function install_irc_bouncer {
         return
     fi
 
-    apt-get -yq -t jessie-backports install znc
+    apt-get -yq install znc
 
     adduser --disabled-login --gecos 'znc' znc
 
diff --git a/src/freedombone-base-email b/src/freedombone-base-email
index b9ea278e..8c826131 100755
--- a/src/freedombone-base-email
+++ b/src/freedombone-base-email
@@ -652,8 +652,6 @@ function create_private_mailing_list {
     if [ ! -d /etc/exim4 ]; then
         return
     fi
-    # This installation doesn't work, results in ruby errors
-    # There is currently no schleuder package for Debian jessie
     if [[ $(is_completed $FUNCNAME) == "1" ]]; then
         return
     fi
diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index 862c8cf9..d3b8c6f3 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -1022,7 +1022,7 @@ function image_setup_utils {
     chroot "$rootdir" apt-get -yq install nfs-kernel-server
 
     if [[ $ARCHITECTURE == 'amd64' ]]; then
-        chroot "$rootdir" apt-get -yq install linux-image-amd64 -t jessie-backports
+        chroot "$rootdir" apt-get -yq install linux-image-amd64
     fi
 
     if [[ $ARCHITECTURE == 'qemu'* || $ARCHITECTURE == 'amd64' || $ARCHITECTURE == 'x86_64' || $ARCHITECTURE == 'i686' || $ARCHITECTURE == 'i386' ]]; then
@@ -1247,7 +1247,7 @@ if [ ! $DEBIAN_REPO ]; then
     DEBIAN_REPO='ftp.de.debian.org'
 fi
 if [ ! $DEBIAN_VERSION ]; then
-    DEBIAN_VERSION='jessie'
+    DEBIAN_VERSION='stretch'
 fi
 
 set_apt_sources $BUILD_MIRROR
diff --git a/src/freedombone-image-makefile b/src/freedombone-image-makefile
index fe9a5634..2a05969b 100755
--- a/src/freedombone-image-makefile
+++ b/src/freedombone-image-makefile
@@ -31,7 +31,7 @@ MIRROR ?= http://httpredir.debian.org/debian
 BUILD_MIRROR ?= http://httpredir.debian.org/debian
 IMAGE_SIZE ?= 8G
 IMAGE_NAME ?= 'full'
-SUITE ?= jessie
+SUITE ?= stretch
 # include source packages in image?
 SOURCE ?= false
 
diff --git a/src/freedombone-utils-setup b/src/freedombone-utils-setup
index c0dae843..52c858de 100755
--- a/src/freedombone-utils-setup
+++ b/src/freedombone-utils-setup
@@ -177,7 +177,7 @@ function install_backports_kernel {
     architecture_type=$(uname -a)
 
     if [[ "$architecture_type" == *"amd64"* ]]; then
-        apt-get -yq install linux-image-amd64 -t jessie-backports
+        apt-get -yq install linux-image-amd64
     fi
 }
 
diff --git a/src/freedombone-vars b/src/freedombone-vars
index 0bd2dc7c..1ff5ff18 100755
--- a/src/freedombone-vars
+++ b/src/freedombone-vars
@@ -72,7 +72,7 @@ ROUTE_THROUGH_TOR="no"
 # Whether this system is being installed within a docker container
 INSTALLED_WITHIN_DOCKER="no"
 
-DEBIAN_VERSION="jessie"
+DEBIAN_VERSION="stretch"
 
 # social key management
 ENABLE_SOCIAL_KEY_MANAGEMENT="no"