diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-09-07 15:11:20 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:17:21 +0100 |
| commit | 83bc63f725263c571094e3af1c88c58992bf0ac6 (patch) | |
| tree | 25be3b96127e122c9f1448f6155dea6b03293248 /functions/architecture.sh | |
| parent | 293765885126c0fe429718f403be2802a225cd68 (diff) | |
| download | vyos-live-build-83bc63f725263c571094e3af1c88c58992bf0ac6.tar.gz vyos-live-build-83bc63f725263c571094e3af1c88c58992bf0ac6.zip | |
Updating internal variables from lh to lb scheme, should be the last piece to finish the live-helper to live-build rename.
Diffstat (limited to 'functions/architecture.sh')
| -rwxr-xr-x | functions/architecture.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/functions/architecture.sh b/functions/architecture.sh index 9e6a49abe..b49729348 100755 --- a/functions/architecture.sh +++ b/functions/architecture.sh @@ -15,7 +15,7 @@ Check_architecture () for ARCHITECTURE in ${ARCHITECTURES} do - if [ "$(echo ${LH_ARCHITECTURE} | grep ${ARCHITECTURE})" ] + if [ "$(echo ${LB_ARCHITECTURE} | grep ${ARCHITECTURE})" ] then VALID="true" break @@ -57,13 +57,13 @@ Check_crossarchitecture () Check_multiarchitecture () { - if [ "$(echo ${LH_ARCHITECTURE} | wc -w)" -gt "1" ] + if [ "$(echo ${LB_ARCHITECTURE} | wc -w)" -gt "1" ] then # First, only support multiarch on iso - case "${LH_BINARY_IMAGES}" in + case "${LB_BINARY_IMAGES}" in iso*) # Assemble multi-arch - case "${LH_CURRENT_ARCHITECTURE}" in + case "${LB_CURRENT_ARCHITECTURE}" in amd64) DESTDIR="${DESTDIR}.amd" DESTDIR_LIVE="${DESTDIR_LIVE}.amd" |