summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-10-25 12:46:13 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-10-25 12:46:13 +0000
commitca8bc22b259d17065726e0ff5b3ba068e2542667 (patch)
tree5d79454036e4a1c1d75b5be6cf767252d95a55c2
parentSwitching default distribution to stretch in container create scripts. (diff)
downloadcompute-tools-ca8bc22b259d17065726e0ff5b3ba068e2542667.tar.xz
compute-tools-ca8bc22b259d17065726e0ff5b3ba068e2542667.zip
Replacing support for Progress Linux 3 (cairon) with Progress Linux 4 (dschinn).
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
-rw-r--r--share/doc/examples/dschinn-backports.cfg (renamed from share/doc/examples/cairon-backports.cfg)6
-rwxr-xr-xshare/scripts/debconf.d/0003-debconf10
2 files changed, 8 insertions, 8 deletions
diff --git a/share/doc/examples/cairon-backports.cfg b/share/doc/examples/dschinn-backports.cfg
index b4cd45c..75296dc 100644
--- a/share/doc/examples/cairon-backports.cfg
+++ b/share/doc/examples/dschinn-backports.cfg
@@ -1,17 +1,17 @@
# container-tools - Manage systemd-nspawn containers
#
-# example for automated Progress Linux 3+ (cairon-backports) container creation
+# example for automated Progress Linux 4+ (dschinn-backports) container creation
# using: sudo container create -s progress-linux
#container-tools cnt-debconf/preseed-files string
#container-tools cnt-debconf/include-preseed-files string
-container-tools cnt-debconf/distribution select cairon-backports
+container-tools cnt-debconf/distribution select dschinn-backports
#container-tools cnt-debconf/parent-distribution select
container-tools cnt-debconf/architecture select auto
-container-tools cnt-debconf/archives multiselect cairon-security, cairon-updates, cairon-extras, cairon-backports, cairon-backports-extras
+container-tools cnt-debconf/archives multiselect dschinn-security, dschinn-updates, dschinn-extras, dschinn-backports, dschinn-backports-extras
#container-tools cnt-debconf/parent-archives multiselect
container-tools cnt-debconf/mirror string https://cdn.archive.progress-linux.org/packages
diff --git a/share/scripts/debconf.d/0003-debconf b/share/scripts/debconf.d/0003-debconf
index ff9440b..c0944fa 100755
--- a/share/scripts/debconf.d/0003-debconf
+++ b/share/scripts/debconf.d/0003-debconf
@@ -40,10 +40,10 @@ Distribution ()
;;
progress-linux)
- db_subst cnt-debconf/distribution CHOICES "Progress Linux 3 (cairon), Progress Linux 3+ (cairon-backports)"
- db_subst cnt-debconf/distribution CHOICES_C "cairon, cairon-backports"
+ db_subst cnt-debconf/distribution CHOICES "Progress Linux 4 (dschinn), Progress Linux 4+ (dschinn-backports)"
+ db_subst cnt-debconf/distribution CHOICES_C "dschinn, dschinn-backports"
- db_set cnt-debconf/distribution cairon-backports
+ db_set cnt-debconf/distribution dschinn-backports
db_fset cnt-debconf/distribution seen false
;;
esac
@@ -70,8 +70,8 @@ Parent_distribution ()
case "${MODE}" in
progress-linux)
case "${DISTRIBUTION}" in
- cairon*)
- PARENT_DISTRIBUTION="jessie"
+ dschinn*)
+ PARENT_DISTRIBUTION="stretch"
;;
esac
;;