summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2021-11-02 14:15:10 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2021-11-02 14:15:10 +0000
commit0b4413e82327f8ed2413a78b94f17f2432afb00d (patch)
tree64464d066b1c66f0e051b95e97d32d5a93dcbb07 /share
parentAdding 'exit' in debconf build script, thanks to Katharina. (diff)
downloadcompute-tools-0b4413e82327f8ed2413a78b94f17f2432afb00d.tar.xz
compute-tools-0b4413e82327f8ed2413a78b94f17f2432afb00d.zip
Sorting preseed-file options in build- and create scripts.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Diffstat (limited to '')
-rwxr-xr-xshare/build-scripts/debconf.d/0001-preseed-file8
-rwxr-xr-xshare/create-scripts/debconf.d/0001-preseed-file8
2 files changed, 8 insertions, 8 deletions
diff --git a/share/build-scripts/debconf.d/0001-preseed-file b/share/build-scripts/debconf.d/0001-preseed-file
index d7e52f0..78c10f0 100755
--- a/share/build-scripts/debconf.d/0001-preseed-file
+++ b/share/build-scripts/debconf.d/0001-preseed-file
@@ -65,7 +65,7 @@ then
if [ -n "${PRESEED_FILES}" ]
then
- db_subst container/preseed-files CHOICES "exit, none, custom, , ${PRESEED_FILES}"
+ db_subst container/preseed-files CHOICES "custom, exit, none, , ${PRESEED_FILES}"
db_settitle container/title
db_input high container/preseed-files || true
@@ -75,11 +75,11 @@ then
PRESEED_FILE="${RET}" # select
case "${PRESEED_FILE}" in
- exit)
- exit 1
+ custom|none)
;;
- none|custom)
+ exit)
+ exit 1
;;
*)
diff --git a/share/create-scripts/debconf.d/0001-preseed-file b/share/create-scripts/debconf.d/0001-preseed-file
index d7e52f0..78c10f0 100755
--- a/share/create-scripts/debconf.d/0001-preseed-file
+++ b/share/create-scripts/debconf.d/0001-preseed-file
@@ -65,7 +65,7 @@ then
if [ -n "${PRESEED_FILES}" ]
then
- db_subst container/preseed-files CHOICES "exit, none, custom, , ${PRESEED_FILES}"
+ db_subst container/preseed-files CHOICES "custom, exit, none, , ${PRESEED_FILES}"
db_settitle container/title
db_input high container/preseed-files || true
@@ -75,11 +75,11 @@ then
PRESEED_FILE="${RET}" # select
case "${PRESEED_FILE}" in
- exit)
- exit 1
+ custom|none)
;;
- none|custom)
+ exit)
+ exit 1
;;
*)