diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-04-12 19:12:56 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-06-29 11:39:16 +0000 |
| commit | 8dd3b980a1bc34daa4a28ffedf52edf9fa157eef (patch) | |
| tree | d3a4fade8d66d01ed1223b87b430ce33d544aa52 | |
| parent | Using full distributor name for progress-linux when matching lsb_release outp... (diff) | |
| download | open-infrastructure-compute-tools-8dd3b980a1bc34daa4a28ffedf52edf9fa157eef.tar.xz open-infrastructure-compute-tools-8dd3b980a1bc34daa4a28ffedf52edf9fa157eef.zip | |
Removing conditional default handling for suggest container create script based on distributor, it hasn't worked anyway.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
| -rw-r--r-- | debian/open-infrastructure-container-tools.config | 19 | ||||
| -rw-r--r-- | debian/open-infrastructure-container-tools.templates | 2 |
2 files changed, 1 insertions, 20 deletions
diff --git a/debian/open-infrastructure-container-tools.config b/debian/open-infrastructure-container-tools.config index 3384ed7..d50839e 100644 --- a/debian/open-infrastructure-container-tools.config +++ b/debian/open-infrastructure-container-tools.config @@ -35,25 +35,6 @@ then SCRIPT_CHOICES="$(cd /usr/share/compute-tools/scripts && find -maxdepth 1 -not -type d -and -not -name 'default' -and -not -name 'debconf' -and -not -name '*.d' -printf '%P\n' | sort)" db_subst open-infrastructure-container-tools/script SCRIPT_CHOICES "$(echo ${SCRIPT_CHOICES} | sed -e 's| |, |g')" - if [ -x "$(which lsb_release)" ] - then - DISTRIBUTOR="$(lsb_release -is 2>/dev/null)" - fi - - DISTRIBUTOR="${DISTRIBUTOR:-Debian}" - - case "${DISTRIBUTOR}" in - Progress-Linux) - SCRIPT_DEFAULT="progress-linux" - ;; - - *) - SCRIPT_DEFAULT="debian" - ;; - esac - - db_subst open-infrastructure-container-tools/script SCRIPT_DEFAULT "${SCRIPT_DEFAULT}" - db_settitle open-infrastructure-container-tools/title db_input low open-infrastructure-container-tools/script || true db_go diff --git a/debian/open-infrastructure-container-tools.templates b/debian/open-infrastructure-container-tools.templates index 6ecea08..6d5f9d0 100644 --- a/debian/open-infrastructure-container-tools.templates +++ b/debian/open-infrastructure-container-tools.templates @@ -64,7 +64,7 @@ _Description: cache directory: Template: open-infrastructure-container-tools/script Type: select _Choices: ${SCRIPT_CHOICES} -Default: ${SCRIPT_DEFAULT} +Default: debian _Description: create script: Please select the script that will be used by default to create containers. |