summaryrefslogtreecommitdiff
path: root/functions/architectures.sh
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2014-12-10 07:39:58 +0100
committerDaniel Baumann <mail@daniel-baumann.ch>2014-12-10 07:39:58 +0100
commit1f7f6dd88a36403c0bc877ee6c4a58f7acfc2034 (patch)
treeb98ff62505af2e1d3b2e0e394ffb92f81239cfec /functions/architectures.sh
parent7b6dfd9d167b5ef09c6c1812f17e6df302f45897 (diff)
downloadvyos-live-build-1f7f6dd88a36403c0bc877ee6c4a58f7acfc2034.tar.gz
vyos-live-build-1f7f6dd88a36403c0bc877ee6c4a58f7acfc2034.zip
Cleaning up from python removal (LIVE_IMAGE_ARCHITECTURE).
Diffstat (limited to 'functions/architectures.sh')
-rwxr-xr-xfunctions/architectures.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/functions/architectures.sh b/functions/architectures.sh
index df145c147..4d253c2d4 100755
--- a/functions/architectures.sh
+++ b/functions/architectures.sh
@@ -15,7 +15,7 @@ Check_architectures ()
for ARCHITECTURE in ${ARCHITECTURES}
do
- if [ "$(echo ${LIVE_IMAGE_ARCHITECTURE} | grep ${ARCHITECTURE})" ]
+ if [ "$(echo ${LB_ARCHITECTURES} | grep ${ARCHITECTURE})" ]
then
VALID="true"
break
@@ -70,7 +70,7 @@ Check_crossarchitectures ()
;;
esac
- if [ "${LIVE_IMAGE_ARCHITECTURE}" = "${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" ]
+ if [ "${LB_ARCHITECTURES}" = "${LB_BOOTSTRAP_QEMU_ARCHITECTURES}" ]
then
if [ ! -e "${LB_BOOTSTRAP_QEMU_STATIC}" ]
@@ -93,7 +93,7 @@ Check_crossarchitectures ()
Check_multiarchitectures ()
{
- if [ "$(echo ${LIVE_IMAGE_ARCHITECTURE} | wc -w)" -gt "1" ]
+ if [ "$(echo ${LB_ARCHITECTURES} | wc -w)" -gt "1" ]
then
# First, only support multiarch on iso
case "${LIVE_IMAGE_TYPE}" in