From 8bc6ee87c76bedcc7ce0b86a619e40eda36904eb Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 25 Oct 2016 14:46:13 +0200 Subject: Switching default distribution to stretch in container create scripts. Signed-off-by: Daniel Baumann --- share/doc/asciicast/introduction.sh | 2 +- share/doc/examples/jessie.cfg | 32 ---------------------------- share/doc/examples/stretch.cfg | 32 ++++++++++++++++++++++++++++ share/man/container-create-debconf.1.txt | 2 +- share/man/container-create-debootstrap.1.txt | 10 ++++----- share/scripts/debconf.d/0003-debconf | 2 +- share/scripts/debootstrap | 2 +- 7 files changed, 41 insertions(+), 41 deletions(-) delete mode 100644 share/doc/examples/jessie.cfg create mode 100644 share/doc/examples/stretch.cfg 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/jessie.cfg deleted file mode 100644 index 8248437..0000000 --- a/share/doc/examples/jessie.cfg +++ /dev/null @@ -1,32 +0,0 @@ -# container-tools - Manage systemd-nspawn containers -# -# example for automated Debian 8 (jessie) 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/parent-distribution select - -container-tools cnt-debconf/architecture select auto - -container-tools cnt-debconf/archives multiselect jessie-security, jessie-updates -#container-tools cnt-debconf/parent-archives multiselect - -container-tools cnt-debconf/mirror string https://deb.debian.org/debian -container-tools cnt-debconf/mirror-security string http://security.debian.org - -#container-tools cnt-debconf/parent-mirror string -#container-tools cnt-debconf/parent-mirror-security string - -container-tools cnt-debconf/archive-areas multiselect main -#container-tools cnt-debconf/parent-archive-areas multiselect - -container-tools cnt-debconf/packages string openssh-server - -container-tools cnt-debconf/root-password string debian -#container-tools cnt-debconf/root-password-crypted string - -container-tools cnt-debconf/network0/bridge string br0 -#container-tools cnt-debconf/network-mac string diff --git a/share/doc/examples/stretch.cfg b/share/doc/examples/stretch.cfg new file mode 100644 index 0000000..2af4b85 --- /dev/null +++ b/share/doc/examples/stretch.cfg @@ -0,0 +1,32 @@ +# container-tools - Manage systemd-nspawn containers +# +# 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 stretch +#container-tools cnt-debconf/parent-distribution select + +container-tools cnt-debconf/architecture select auto + +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 +container-tools cnt-debconf/mirror-security string http://security.debian.org + +#container-tools cnt-debconf/parent-mirror string +#container-tools cnt-debconf/parent-mirror-security string + +container-tools cnt-debconf/archive-areas multiselect main +#container-tools cnt-debconf/parent-archive-areas multiselect + +container-tools cnt-debconf/packages string openssh-server + +container-tools cnt-debconf/root-password string debian +#container-tools cnt-debconf/root-password-crypted string + +container-tools cnt-debconf/network0/bridge string br0 +#container-tools cnt-debconf/network-mac string 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)}" -- cgit v1.2.3