Browse Source

Change distro to stretch

Bob Mottram 7 years ago
parent
commit
d308c83e0a

+ 1
- 1
src/freedombone-addcert View File

@@ -222,7 +222,7 @@ function add_cert_letsencrypt {
222 222
     fi
223 223
 
224 224
     if [ ! -f /usr/bin/certbot ]; then
225
-        apt-get -yq install certbot -t jessie-backports
225
+        apt-get -yq install certbot
226 226
         if [ ! -f /usr/bin/certbot ]; then
227 227
             echo $'LetsEncrypt certbot failed to install'
228 228
             exit 762830

+ 1
- 1
src/freedombone-app-irc View File

@@ -613,7 +613,7 @@ function install_irc_bouncer {
613 613
         return
614 614
     fi
615 615
 
616
-    apt-get -yq -t jessie-backports install znc
616
+    apt-get -yq install znc
617 617
 
618 618
     adduser --disabled-login --gecos 'znc' znc
619 619
 

+ 0
- 2
src/freedombone-base-email View File

@@ -652,8 +652,6 @@ function create_private_mailing_list {
652 652
     if [ ! -d /etc/exim4 ]; then
653 653
         return
654 654
     fi
655
-    # This installation doesn't work, results in ruby errors
656
-    # There is currently no schleuder package for Debian jessie
657 655
     if [[ $(is_completed $FUNCNAME) == "1" ]]; then
658 656
         return
659 657
     fi

+ 2
- 2
src/freedombone-image-customise View File

@@ -1022,7 +1022,7 @@ function image_setup_utils {
1022 1022
     chroot "$rootdir" apt-get -yq install nfs-kernel-server
1023 1023
 
1024 1024
     if [[ $ARCHITECTURE == 'amd64' ]]; then
1025
-        chroot "$rootdir" apt-get -yq install linux-image-amd64 -t jessie-backports
1025
+        chroot "$rootdir" apt-get -yq install linux-image-amd64
1026 1026
     fi
1027 1027
 
1028 1028
     if [[ $ARCHITECTURE == 'qemu'* || $ARCHITECTURE == 'amd64' || $ARCHITECTURE == 'x86_64' || $ARCHITECTURE == 'i686' || $ARCHITECTURE == 'i386' ]]; then
@@ -1247,7 +1247,7 @@ if [ ! $DEBIAN_REPO ]; then
1247 1247
     DEBIAN_REPO='ftp.de.debian.org'
1248 1248
 fi
1249 1249
 if [ ! $DEBIAN_VERSION ]; then
1250
-    DEBIAN_VERSION='jessie'
1250
+    DEBIAN_VERSION='stretch'
1251 1251
 fi
1252 1252
 
1253 1253
 set_apt_sources $BUILD_MIRROR

+ 1
- 1
src/freedombone-image-makefile View File

@@ -31,7 +31,7 @@ MIRROR ?= http://httpredir.debian.org/debian
31 31
 BUILD_MIRROR ?= http://httpredir.debian.org/debian
32 32
 IMAGE_SIZE ?= 8G
33 33
 IMAGE_NAME ?= 'full'
34
-SUITE ?= jessie
34
+SUITE ?= stretch
35 35
 # include source packages in image?
36 36
 SOURCE ?= false
37 37
 

+ 1
- 1
src/freedombone-utils-setup View File

@@ -177,7 +177,7 @@ function install_backports_kernel {
177 177
     architecture_type=$(uname -a)
178 178
 
179 179
     if [[ "$architecture_type" == *"amd64"* ]]; then
180
-        apt-get -yq install linux-image-amd64 -t jessie-backports
180
+        apt-get -yq install linux-image-amd64
181 181
     fi
182 182
 }
183 183
 

+ 1
- 1
src/freedombone-vars View File

@@ -72,7 +72,7 @@ ROUTE_THROUGH_TOR="no"
72 72
 # Whether this system is being installed within a docker container
73 73
 INSTALLED_WITHIN_DOCKER="no"
74 74
 
75
-DEBIAN_VERSION="jessie"
75
+DEBIAN_VERSION="stretch"
76 76
 
77 77
 # social key management
78 78
 ENABLE_SOCIAL_KEY_MANAGEMENT="no"