summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLyndon Brown <jnqnfe@gmail.com>2020-03-28 05:31:22 +0000
committerRaphaƫl Hertzog <hertzog@debian.org>2020-04-23 14:51:28 +0200
commit430fdc3040b6a05819a2926779c3d12e77fbd3c0 (patch)
treeae45b2f482f1ed7628a7c6d9d46dbfc08abb4486
parent39e4d3e3cbcc8d37700cfe46a95f669b4d9479ea (diff)
downloadvyos-live-build-430fdc3040b6a05819a2926779c3d12e77fbd3c0.tar.gz
vyos-live-build-430fdc3040b6a05819a2926779c3d12e77fbd3c0.zip
config: move defaults set in wrong function
Gbp-Dch: Ignore
-rwxr-xr-xfunctions/defaults.sh18
1 files changed, 9 insertions, 9 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index c52acb80a..74e6f0e73 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -578,6 +578,15 @@ Set_config_defaults ()
# Setting image type
LB_SOURCE_IMAGES="${LB_SOURCE_IMAGES:-tar}"
LB_SOURCE_IMAGES="$(echo "${LB_SOURCE_IMAGES}" | tr "," " ")"
+
+ # Architectures to use foreign bootstrap for
+ LB_BOOTSTRAP_QEMU_ARCHITECTURES="${LB_BOOTSTRAP_QEMU_ARCHITECTURES:-}"
+
+ # Packages to exclude for the foreign/ports bootstrapping
+ LB_BOOTSTRAP_QEMU_EXCLUDE="${LB_BOOTSTRAP_QEMU_EXCLUDE:-}"
+
+ # Ports using foreign bootstrap need a working qemu-*-system. This is the location it
+ LB_BOOTSTRAP_QEMU_STATIC="${LB_BOOTSTRAP_QEMU_STATIC:-}"
}
Check_config_defaults ()
@@ -657,13 +666,4 @@ Check_config_defaults ()
Echo_warning "You have specified a value of LB_ISO_VOLUME that is too long; the maximum length is 32 characters."
fi
- # Architectures to use foreign bootstrap for
- LB_BOOTSTRAP_QEMU_ARCHITECTURES="${LB_BOOTSTRAP_QEMU_ARCHITECTURES:-}"
-
- # Packages to exclude for the foreign/ports bootstrapping
- LB_BOOTSTRAP_QEMU_EXCLUDE="${LB_BOOTSTRAP_QEMU_EXCLUDE:-}"
-
- # Ports using foreign bootstrap need a working qemu-*-system. This is the location it
- LB_BOOTSTRAP_QEMU_STATIC="${LB_BOOTSTRAP_QEMU_STATIC:-}"
-
}