summaryrefslogtreecommitdiff
path: root/scripts/build/config
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-12-19 21:48:49 +0100
committerDaniel Baumann <mail@daniel-baumann.ch>2013-05-06 14:50:03 +0200
commit5123ca45477c8297dac700d16fff8c67f01bf791 (patch)
tree62e5adb3b0cc080fa8c58eec1b9de63343ff2c6f /scripts/build/config
parent8248ffd20f36d55f697812f92ff0335c82b38f1c (diff)
downloadvyos-live-build-5123ca45477c8297dac700d16fff8c67f01bf791.tar.gz
vyos-live-build-5123ca45477c8297dac700d16fff8c67f01bf791.zip
Moving off binary image parent archive areas into new config tree format.
Diffstat (limited to 'scripts/build/config')
-rwxr-xr-xscripts/build/config7
1 files changed, 2 insertions, 5 deletions
diff --git a/scripts/build/config b/scripts/build/config
index 89cc2cd87..c4fd34649 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -496,7 +496,7 @@ Local_arguments ()
;;
--parent-archive-areas)
- LB_PARENT_ARCHIVE_AREAS="${2}"
+ LIVE_IMAGE_PARENT_ARCHIVE_AREAS="${2}"
shift 2
;;
@@ -1210,10 +1210,6 @@ LB_MIRROR_DEBIAN_INSTALLER="${LB_MIRROR_DEBIAN_INSTALLER}"
# (Default: empty)
LB_ARCHIVES="${LB_ARCHIVES}"
-# \$LB_PARENT_ARCHIVE_AREAS: select archive areas to use
-# (Default: ${LB_PARENT_ARCHIVE_AREAS})
-LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS}"
-
# \$LB_BOOTSTRAP_QEMU_ARCHITECTURES: architectures to use foreign bootstrap
# (Default: ${LB_BOOTSTRAP_QEMU_ARCHITECTURES})
LB_BOOTSTRAP_QEMU_ARCHITECTURES="${LB_BOOTSTRAP_QEMU_ARCHITECTURES}"
@@ -1493,6 +1489,7 @@ echo "" >> config/control
Set_configuration "config/control" "Name" "${LIVE_IMAGE_NAME}"
Set_configuration "config/control" "Architecture" "${LIVE_IMAGE_ARCHITECTURE}"
Set_configuration "config/control" "Archive-Areas" "${LIVE_IMAGE_ARCHIVE_AREAS}"
+Set_configuration "config/control" "Parent-Archive-Areas" "${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}"
Set_configuration "config/control" "Type" "${LIVE_IMAGE_TYPE}"
# Creating stage file