diff options
| author | Daniel Baumann <daniel.baumann@open-infrastructure.net> | 2019-02-26 03:24:14 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@open-infrastructure.net> | 2019-02-26 03:32:13 +0000 |
| commit | c4c8e957a038f2e8583ccd1b46c401d9e7a568e9 (patch) | |
| tree | c0a16d2455ba6ee81db4839a21d347387aeadb2c | |
| parent | Removing progress-linux apt sources.list handling in container debconf create... (diff) | |
| download | compute-tools-c4c8e957a038f2e8583ccd1b46c401d9e7a568e9.tar.xz compute-tools-c4c8e957a038f2e8583ccd1b46c401d9e7a568e9.zip | |
Allow to select/deselect main repository in container debconf create script.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
| -rwxr-xr-x | share/scripts/debconf.d/0003-debconf | 34 | ||||
| -rw-r--r-- | share/scripts/debconf.d/0003-debconf.templates | 2 |
2 files changed, 11 insertions, 25 deletions
diff --git a/share/scripts/debconf.d/0003-debconf b/share/scripts/debconf.d/0003-debconf index c2d7897..69a1e09 100755 --- a/share/scripts/debconf.d/0003-debconf +++ b/share/scripts/debconf.d/0003-debconf @@ -195,29 +195,22 @@ Archives () debian) case "${PARENT_DISTRIBUTION}" in sid) - db_subst container/archives CHOICES "Experimental" - db_subst container/archives CHOICES_C "experimental" + db_subst container/archives CHOICES "sid, experimental" - db_set container/archives "" + db_set container/archives "sid" db_fset container/archives seen false ;; *) - db_subst container/archives CHOICES "Security, Updates, Backports, Proposed Updates" - db_subst container/archives CHOICES_C "${DISTRIBUTION}-security, ${DISTRIBUTION}-updates, ${DISTRIBUTION}-backports, ${DISTRIBUTION}-proposed-updates" + db_subst container/archives CHOICES "${DISTRIBUTION}, ${DISTRIBUTION}-security, ${DISTRIBUTION}-updates, ${DISTRIBUTION}-backports, ${DISTRIBUTION}-proposed-updates" case "${PARENT_DISTRIBUTION}" in sid) - db_set container/archives "" - ;; - - buster) - db_set container/archives "${DISTRIBUTION}-security, ${DISTRIBUTION}-updates" + db_set container/archives "sid" ;; *) - #db_set container/archives "${DISTRIBUTION}-security, ${DISTRIBUTION}-updates, ${DISTRIBUTION}-backports" - db_set container/archives "${DISTRIBUTION}-security, ${DISTRIBUTION}-updates" + db_set container/archives "${DISTRIBUTION}, ${DISTRIBUTION}-security, ${DISTRIBUTION}-updates" ;; esac @@ -229,10 +222,9 @@ Archives () progress-linux) DIST="$(echo ${DISTRIBUTION} | sed -e 's|-backports||')" - db_subst container/archives CHOICES "Security, Updates, Extras, Backports, Backports Extras" - db_subst container/archives CHOICES_C "${DIST}-security, ${DIST}-updates, ${DIST}-extras, ${DIST}-backports, ${DIST}-backports-extras" + db_subst container/archives CHOICES "${DIST}, ${DIST}-security, ${DIST}-updates, ${DIST}-extras, ${DIST}-backports, ${DIST}-backports-extras" - db_set container/archives "${DIST}-security, ${DIST}-updates, ${DIST}-extras, ${DIST}-backports, ${DIST}-backports-extras" + db_set container/archives "${DIST}, ${DIST}-security, ${DIST}-updates, ${DIST}-extras, ${DIST}-backports, ${DIST}-backports-extras" db_fset container/archives seen false ;; esac @@ -260,13 +252,11 @@ Parent_archives () then case "${MODE}" in progress-linux) - db_subst container/parent-archives CHOICES "Security, Updates, Backports, Proposed Updates" - db_subst container/parent-archives CHOICES_C "${PARENT_DISTRIBUTION}-security, ${PARENT_DISTRIBUTION}-updates, ${PARENT_DISTRIBUTION}-backports, ${PARENT_DISTRIBUTION}-proposed-updates" + db_subst container/parent-archives CHOICES "${PARENT_DISTRIBUTION}, ${PARENT_DISTRIBUTION}-security, ${PARENT_DISTRIBUTION}-updates, ${PARENT_DISTRIBUTION}-backports, ${PARENT_DISTRIBUTION}-proposed-updates" case "${PARENT_DISTRIBUTION}" in *) - #db_set container/parent-archives "${PARENT_DISTRIBUTION}-security, ${PARENT_DISTRIBUTION}-updates, ${PARENT_DISTRIBUTION}-backports" - db_set container/parent-archives "${PARENT_DISTRIBUTION}-security, ${PARENT_DISTRIBUTION}-updates" + db_set container/parent-archives "${PARENT_DISTRIBUTION}, ${PARENT_DISTRIBUTION}-security, ${PARENT_DISTRIBUTION}-updates" ;; esac @@ -278,8 +268,7 @@ Parent_archives () ;; *) - db_subst container/parent-archives CHOICES "Security, Updates, Backports, Proposed Updates" - db_subst container/parent-archives CHOICES_C "${ARCHIVES}" + db_subst container/parent-archives CHOICES "${DISTRIBUTION}, ${DISTRIBUTION}-security, ${DISTRIBUTION}-updates, ${DISTRIBUTION}-backports, ${DISTRIBUTION}-proposed-updates" db_set container/parent-archives "${ARCHIVES}" db_fset container/parent-archives seen true @@ -295,8 +284,7 @@ Parent_archives () progress-linux) case "${PARENT_DISTRIBUTION}" in *) - #PARENT_ARCHIVES="${PARENT_DISTRIBUTION}-security, ${PARENT_DISTRIBUTION}-updates, ${PARENT_DISTRIBUTION}-backports" - PARENT_ARCHIVES="${PARENT_DISTRIBUTION}-security, ${PARENT_DISTRIBUTION}-updates" + PARENT_ARCHIVES="${PARENT_DISTRIBUTION}, ${PARENT_DISTRIBUTION}-security, ${PARENT_DISTRIBUTION}-updates" ;; esac ;; diff --git a/share/scripts/debconf.d/0003-debconf.templates b/share/scripts/debconf.d/0003-debconf.templates index 3d607a7..13899ef 100644 --- a/share/scripts/debconf.d/0003-debconf.templates +++ b/share/scripts/debconf.d/0003-debconf.templates @@ -37,7 +37,6 @@ Description: Architecture Template: container/archives Type: multiselect Default: -Choices-C: ${CHOICES_C} Choices: ${CHOICES} Description: Archives Archives. @@ -45,7 +44,6 @@ Description: Archives Template: container/parent-archives Type: multiselect Default: -Choices-C: ${CHOICES_C} Choices: ${CHOICES} Description: Parent Archives Parent Archives. |