Switching default distribution to stretch in container create scripts.

Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>

6 files changed, 12 insertions, 12 deletions

diff --git a/share/doc/asciicast/introduction.sh b/share/doc/asciicast/introduction.sh
index 148231d..18dfdaf 100755
--- a/share/doc/asciicast/introduction.sh
+++ b/share/doc/asciicast/introduction.sh
@@ -81,7 +81,7 @@ Text "# Note: we're using a custom mirror here and"
 Text "# a custom root password, see container-create-debootstrap(1)"
 Text "# for more information about these options."
 
-Command "sudo cnt create -n example.net -s debootstrap -- -d sid -m http://ftp.ch.debian.org/debian -p debian"
+Command "sudo cnt create -n example.net -s debootstrap -- -d stretch -m http://ftp.ch.debian.org/debian -p debian"
 
 
 Text "# 4. Let's list all available containers."
diff --git a/share/doc/examples/jessie.cfg b/share/doc/examples/stretch.cfg
index 8248437..2af4b85 100644
--- a/share/doc/examples/jessie.cfg
+++ b/share/doc/examples/stretch.cfg
@@ -1,17 +1,17 @@
 # container-tools - Manage systemd-nspawn containers
 #
-# example for automated Debian 8 (jessie) based container creation
+# example for automated Debian 9 (stretch) based container creation
 # using: sudo container create -s debian
 
 #container-tools cnt-debconf/preseed-files string 
 #container-tools cnt-debconf/include-preseed-files string 
 
-container-tools cnt-debconf/distribution select jessie
+container-tools cnt-debconf/distribution select stretch
 #container-tools cnt-debconf/parent-distribution select 
 
 container-tools cnt-debconf/architecture select auto
 
-container-tools cnt-debconf/archives multiselect jessie-security, jessie-updates
+container-tools cnt-debconf/archives multiselect stretch-security, stretch-updates
 #container-tools cnt-debconf/parent-archives multiselect 
 
 container-tools cnt-debconf/mirror string https://deb.debian.org/debian
diff --git a/share/man/container-create-debconf.1.txt b/share/man/container-create-debconf.1.txt
index 76f86cc..9593415 100644
--- a/share/man/container-create-debconf.1.txt
+++ b/share/man/container-create-debconf.1.txt
@@ -101,7 +101,7 @@ The following script options are available:
 EXAMPLES
 --------
 *Create a Debian based container:*::
-	sudo container create -s debian -n jessie.example.net
+	sudo container create -s debian -n stretch.example.net
 
 *Create a Progress Linux container:*::
 	sudo container create -s progress-linux -n cairon-backports.example.net
diff --git a/share/man/container-create-debootstrap.1.txt b/share/man/container-create-debootstrap.1.txt
index 2298be6..7f7d8fb 100644
--- a/share/man/container-create-debootstrap.1.txt
+++ b/share/man/container-create-debootstrap.1.txt
@@ -54,7 +54,7 @@ The following script options are available:
 	Specify the Debian architecture, defaults to the host systems architecture.
 
 *-d, --distribution='DISTRIBUTION'*::
-	Specify the Debian distribution, defaults to jessie.
+	Specify the Debian distribution, defaults to stretch.
 
 *-m, --mirror='MIRROR'*::
 	Specify the Debian mirror, defaults to https://deb.debian.org/debian.
@@ -65,11 +65,11 @@ The following script options are available:
 
 EXAMPLES
 --------
-*Create a Debian 8 (jessie) based container with same architecture as the host system:*::
-	sudo container create -s debootstrap -n jessie.example.net
+*Create a Debian 9 (stretch) based container with same architecture as the host system:*::
+	sudo container create -s debootstrap -n stretch.example.net
 
-*Create a Debian 8 (jessie) based container with different architecture as the host system:*::
-	sudo container create -s debootstrap -n jessie-i386.example.net -- -a i386
+*Create a Debian 9 (stretch) based container with different architecture as the host system:*::
+	sudo container create -s debootstrap -n stretch-i386.example.net -- -a i386
 
 
 SEE ALSO
diff --git a/share/scripts/debconf.d/0003-debconf b/share/scripts/debconf.d/0003-debconf
index 92d9f0e..ff9440b 100755
--- a/share/scripts/debconf.d/0003-debconf
+++ b/share/scripts/debconf.d/0003-debconf
@@ -35,7 +35,7 @@ Distribution ()
 				db_subst cnt-debconf/distribution CHOICES "Debian GNU/Linux 8 \"jessie\", Debian GNU/Linux 9 \"stretch\", Debian GNU/Linux unstable/sid"
 				db_subst cnt-debconf/distribution CHOICES_C "jessie, stretch, sid"
 
-				db_set cnt-debconf/distribution jessie
+				db_set cnt-debconf/distribution stretch
 				db_fset cnt-debconf/distribution seen false
 				;;
 
diff --git a/share/scripts/debootstrap b/share/scripts/debootstrap
index e8ccd77..1ead471 100755
--- a/share/scripts/debootstrap
+++ b/share/scripts/debootstrap
@@ -125,7 +125,7 @@ then
 fi
 
 ARCHITECTURE="${ARCHITECTURE:-$(dpkg --print-architecture)}"
-DISTRIBUTION="${DISTRIBUTION:-jessie}"
+DISTRIBUTION="${DISTRIBUTION:-stretch}"
 MIRROR="${MIRROR:-https://deb.debian.org/debian}"
 PASSWORD="${PASSWORD:-$(dd if=/dev/urandom bs=12 count=1 2> /dev/null | base64)}"