free
/
freedomboneeee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change distro to stretch

This commit is contained in:
Bob Mottram 2017-05-29 13:57:39 +01:00
parent 54c9a071f9
commit d308c83e0a
7 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/freedombone-addcert
View File

@ -222,7 +222,7 @@ function add_cert_letsencrypt {
fi fi
if [ ! -f /usr/bin/certbot ]; then 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 if [ ! -f /usr/bin/certbot ]; then
echo $'LetsEncrypt certbot failed to install' echo $'LetsEncrypt certbot failed to install'
exit 762830 exit 762830

2
src/freedombone-app-irc
View File

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

2
src/freedombone-base-email
View File

@ -652,8 +652,6 @@ function create_private_mailing_list {
if [ ! -d /etc/exim4 ]; then if [ ! -d /etc/exim4 ]; then
return return
fi 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 if [[ $(is_completed $FUNCNAME) == "1" ]]; then
return return
fi fi

4
src/freedombone-image-customise
View File

@ -1022,7 +1022,7 @@ function image_setup_utils {
chroot "$rootdir" apt-get -yq install nfs-kernel-server chroot "$rootdir" apt-get -yq install nfs-kernel-server
if [[ $ARCHITECTURE == 'amd64' ]]; then 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 fi
if [[ $ARCHITECTURE == 'qemu'* || $ARCHITECTURE == 'amd64' || $ARCHITECTURE == 'x86_64' || $ARCHITECTURE == 'i686' || $ARCHITECTURE == 'i386' ]]; then 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' DEBIAN_REPO='ftp.de.debian.org'
fi fi
if [ ! $DEBIAN_VERSION ]; then if [ ! $DEBIAN_VERSION ]; then
DEBIAN_VERSION='jessie' DEBIAN_VERSION='stretch'
fi fi
set_apt_sources $BUILD_MIRROR set_apt_sources $BUILD_MIRROR

2
src/freedombone-image-makefile
View File

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

2
src/freedombone-utils-setup
View File

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

2
src/freedombone-vars
View File

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