diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2020-10-30 04:13:09 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2020-10-30 04:13:09 +0000 |
| commit | 95981ad90a2c53a07e146ad68bf4c15ab448aa09 (patch) | |
| tree | bd2d683d160728a67a191fe3b87c8acda10587a1 /share/scripts/debconf.d | |
| parent | Releasing debian version 20200830-1. (diff) | |
| download | open-infrastructure-compute-tools-95981ad90a2c53a07e146ad68bf4c15ab448aa09.tar.xz open-infrastructure-compute-tools-95981ad90a2c53a07e146ad68bf4c15ab448aa09.zip | |
Merging upstream version 20201030.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'share/scripts/debconf.d')
| -rwxr-xr-x | share/scripts/debconf.d/0003-debconf | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/share/scripts/debconf.d/0003-debconf b/share/scripts/debconf.d/0003-debconf index c5925f2..dc2db47 100755 --- a/share/scripts/debconf.d/0003-debconf +++ b/share/scripts/debconf.d/0003-debconf @@ -53,18 +53,18 @@ Distribution () then case "${MODE}" in debian) - db_subst container/distribution CHOICES "Debian GNU/Linux 9 \"stretch\", Debian GNU/Linux 10 \"buster\", Debian GNU/Linux testing/bullseye, Debian GNU/Linux unstable/sid" + db_subst container/distribution CHOICES "Debian GNU/Linux 9 \"stretch\", Debian GNU/Linux 10 \"buster\", Debian GNU/Linux 11 \"bullseye\", Debian GNU/Linux unstable/sid" db_subst container/distribution CHOICES_C "stretch, buster, bullseye, sid" - db_set container/distribution buster + db_set container/distribution bullseye db_fset container/distribution seen false ;; progress-linux) - db_subst container/distribution CHOICES "Progress Linux 5 (engywuck), Progress Linux 5+ (engywuck-backports)" - db_subst container/distribution CHOICES_C "engywuck, engywuck-backports" + db_subst container/distribution CHOICES "Progress Linux 5 (engywuck), Progress Linux 5+ (engywuck-backports), Progress Linux 6 (fuchur), Progress Linux 6+ (fuchur-backports)" + db_subst container/distribution CHOICES_C "engywuck, engywuck-backports, fuchur, fuchur-backports" - db_set container/distribution engywuck-backports + db_set container/distribution fuchur-backports db_fset container/distribution seen false ;; esac @@ -94,6 +94,10 @@ Parent_distribution () engywuck*) PARENT_DISTRIBUTION="buster" ;; + + fuchur*) + PARENT_DISTRIBUTION="bullseye" + ;; esac ;; @@ -1242,6 +1246,13 @@ Internal_options () fi echo "CNT_OVERLAY=\"${CNT_OVERLAY}\"" >> "${DEBCONF_TMPDIR}/debconf.default" + + if db_get container/overlay-options + then + CNT_OVERLAY_OPTIONS="${RET}" # string (w/ empty) + fi + + echo "CNT_OVERLAY_OPTIONS=\"${CNT_OVERLAY_OPTIONS}\"" >> "${DEBCONF_TMPDIR}/debconf.default" } Mode |