From ca8bc22b259d17065726e0ff5b3ba068e2542667 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 25 Oct 2016 14:46:13 +0200 Subject: Replacing support for Progress Linux 3 (cairon) with Progress Linux 4 (dschinn). Signed-off-by: Daniel Baumann --- share/doc/examples/cairon-backports.cfg | 66 -------------------------------- share/doc/examples/dschinn-backports.cfg | 66 ++++++++++++++++++++++++++++++++ share/scripts/debconf.d/0003-debconf | 10 ++--- 3 files changed, 71 insertions(+), 71 deletions(-) delete mode 100644 share/doc/examples/cairon-backports.cfg create mode 100644 share/doc/examples/dschinn-backports.cfg diff --git a/share/doc/examples/cairon-backports.cfg b/share/doc/examples/cairon-backports.cfg deleted file mode 100644 index b4cd45c..0000000 --- a/share/doc/examples/cairon-backports.cfg +++ /dev/null @@ -1,66 +0,0 @@ -# container-tools - Manage systemd-nspawn containers -# -# example for automated Progress Linux 3+ (cairon-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/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/parent-archives multiselect - -container-tools cnt-debconf/mirror string https://cdn.archive.progress-linux.org/packages -container-tools cnt-debconf/mirror-security string https://cdn.archive.progress-linux.org/packages - -container-tools cnt-debconf/parent-mirror string https://deb.debian.org/debian -container-tools cnt-debconf/parent-mirror-security string http://security.debian.org - -container-tools cnt-debconf/archive-areas multiselect main, contrib, non-free -container-tools cnt-debconf/parent-archive-areas multiselect main, contrib, non-free - -container-tools cnt-debconf/packages string openssh-server - -container-tools cnt-debconf/root-password string progress -#container-tools cnt-debconf/root-password-crypted string - -# Network IP configuration -container-tools cnt-debconf/network0/bridge string br0 -container-tools cnt-debconf/network0/veth string veth0 -container-tools cnt-debconf/network0/ipv4-method select static -container-tools cnt-debconf/network0/ipv4-comment string Primary network interfaces -container-tools cnt-debconf/network0/ipv4-address string 192.168.0.2 -container-tools cnt-debconf/network0/ipv4-gateway string 192.168.0.1 -container-tools cnt-debconf/network0/ipv4-netmask string 255.255.255.0 -#container-tools cnt-debconf/network0/ipv4-post-up string -#container-tools cnt-debconf/network0/ipv4-post-down string - -# Network DNS configuration -container-tools cnt-debconf/nameserver/server string 127.0.0.1 8.8.8.8 8.8.4.4 -container-tools cnt-debconf/nameserver/domain string example.net -container-tools cnt-debconf/nameserver/search string example.net -container-tools cnt-debconf/nameserver/options string timeout:1 attempts:1 - -# Third-Party Repositories -#container-tools cnt-debconf/archive0/repository string -#container-tools cnt-debconf/archive0/list string -#container-tools cnt-debconf/archive0/comment string -#container-tools cnt-debconf/archive0/source string -#container-tools cnt-debconf/archive0/key string -#container-tools cnt-debconf/archive0/preferences-package string -#container-tools cnt-debconf/archive0/preferences-pin string -#container-tools cnt-debconf/archive0/preferences-pin-priority - -# Internal Options -#container-tools cnt-debconf/apt-recommends string -#container-tools cnt-debconf/debconf-frontend string -#container-tools cnt-debconf/debconf-priority string -#container-tools cnt-debconf/container-command string -#container-tools cnt-debconf/host-command string -container-tools cnt-debconf/auto string FQDN -#container-tools cnt-debconf/overlay string -#container-tools cnt-debconf/bind string diff --git a/share/doc/examples/dschinn-backports.cfg b/share/doc/examples/dschinn-backports.cfg new file mode 100644 index 0000000..75296dc --- /dev/null +++ b/share/doc/examples/dschinn-backports.cfg @@ -0,0 +1,66 @@ +# container-tools - Manage systemd-nspawn containers +# +# 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 dschinn-backports +#container-tools cnt-debconf/parent-distribution select + +container-tools cnt-debconf/architecture select auto + +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 +container-tools cnt-debconf/mirror-security string https://cdn.archive.progress-linux.org/packages + +container-tools cnt-debconf/parent-mirror string https://deb.debian.org/debian +container-tools cnt-debconf/parent-mirror-security string http://security.debian.org + +container-tools cnt-debconf/archive-areas multiselect main, contrib, non-free +container-tools cnt-debconf/parent-archive-areas multiselect main, contrib, non-free + +container-tools cnt-debconf/packages string openssh-server + +container-tools cnt-debconf/root-password string progress +#container-tools cnt-debconf/root-password-crypted string + +# Network IP configuration +container-tools cnt-debconf/network0/bridge string br0 +container-tools cnt-debconf/network0/veth string veth0 +container-tools cnt-debconf/network0/ipv4-method select static +container-tools cnt-debconf/network0/ipv4-comment string Primary network interfaces +container-tools cnt-debconf/network0/ipv4-address string 192.168.0.2 +container-tools cnt-debconf/network0/ipv4-gateway string 192.168.0.1 +container-tools cnt-debconf/network0/ipv4-netmask string 255.255.255.0 +#container-tools cnt-debconf/network0/ipv4-post-up string +#container-tools cnt-debconf/network0/ipv4-post-down string + +# Network DNS configuration +container-tools cnt-debconf/nameserver/server string 127.0.0.1 8.8.8.8 8.8.4.4 +container-tools cnt-debconf/nameserver/domain string example.net +container-tools cnt-debconf/nameserver/search string example.net +container-tools cnt-debconf/nameserver/options string timeout:1 attempts:1 + +# Third-Party Repositories +#container-tools cnt-debconf/archive0/repository string +#container-tools cnt-debconf/archive0/list string +#container-tools cnt-debconf/archive0/comment string +#container-tools cnt-debconf/archive0/source string +#container-tools cnt-debconf/archive0/key string +#container-tools cnt-debconf/archive0/preferences-package string +#container-tools cnt-debconf/archive0/preferences-pin string +#container-tools cnt-debconf/archive0/preferences-pin-priority + +# Internal Options +#container-tools cnt-debconf/apt-recommends string +#container-tools cnt-debconf/debconf-frontend string +#container-tools cnt-debconf/debconf-priority string +#container-tools cnt-debconf/container-command string +#container-tools cnt-debconf/host-command string +container-tools cnt-debconf/auto string FQDN +#container-tools cnt-debconf/overlay string +#container-tools cnt-debconf/bind string 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 ;; -- cgit v1.2.3