diff options
| author | Daniel Baumann <daniel@debian.org> | 2013-01-20 10:36:31 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2013-01-20 10:36:31 +0100 |
| commit | a9b85c8d7bfda527b4f89590286a225bece0abf3 (patch) | |
| tree | 09e6731f5d3ce576b72d84d8a4c6482541ea6a20 | |
| parent | fd3c848218d0d13d3b8a91134285a9eb46f42193 (diff) | |
| download | vyos-live-build-a9b85c8d7bfda527b4f89590286a225bece0abf3.tar.gz vyos-live-build-a9b85c8d7bfda527b4f89590286a225bece0abf3.zip | |
Correcting variable default assignment for new configuration tree layout.
| -rwxr-xr-x | functions/defaults.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index 26150ab9b..ba8e15b1c 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -36,22 +36,22 @@ New_configuration () ## Configuration # Configuration-Version - LIVE_CONFIGURATION_VERSION="$(Get_configuration config/control Configuration-Version)" + LIVE_CONFIGURATION_VERSION="${LIVE_CONFIGURATION_VERSION:-$(Get_configuration config/control Configuration-Version)}" LIVE_CONFIGURATION_VERSION="${LIVE_CONFIGURATION_VERSION:-${LIVE_BUILD_VERSION}}" export LIVE_CONFIGURATION_VERSION # Image: Name - LIVE_IMAGE_NAME="$(Get_configuration config/control Name)" + LIVE_IMAGE_NAME="${LIVE_IMAGE_NAME:-$(Get_configuration config/control Name)}" LIVE_IMAGE_NAME="${LIVE_IMAGE_NAME:-live-image}" export LIVE_IMAGE_NAME # Image: Architecture (FIXME: Support and default to 'any') - LIVE_IMAGE_ARCHITECTURE="$(Get_configuration config/control Architecture)" + LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE:-$(Get_configuration config/control Architecture)}" LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE:-${CURRENT_IMAGE_ARCHITECTURE}}" export LIVE_IMAGE_ARCHITECTURE # Image: Archive Areas - LIVE_IMAGE_ARCHIVE_AREAS="$(Get_configuration config/control Archive-Areas)" + LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-$(Get_configuration config/control Archive-Areas)}" case "${LB_MODE}" in progress-linux) @@ -70,12 +70,12 @@ New_configuration () export LIVE_IMAGE_ARCHIVE_AREAS # Image: Archive Areas - LIVE_IMAGE_PARENT_ARCHIVE_AREAS="$(Get_configuration config/control Parent-Archive-Areas)" + LIVE_IMAGE_PARENT_ARCHIVE_AREAS="${LIVE_IMAGE_PARENT_ARCHIVE_AREAS:-$(Get_configuration config/control Parent-Archive-Areas)}" LIVE_IMAGE_PARENT_ARCHIVE_AREAS="${LIVE_IMAGE_PARENT_ARCHIVE_AREAS:-${LIVE_IMAGE_ARCHIVE_AREAS}}" export LIVE_IMAGE_PARENT_ARCHIVE_AREAS # Image: Type - LIVE_IMAGE_TYPE="$(Get_configuration config/control Type)" + LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-$(Get_configuration config/control Type)}" LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-iso-hybrid}" export LIVE_IMAGE_TYPE } |