diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2013-04-06 10:46:04 +0200 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2013-05-06 14:50:07 +0200 |
| commit | 8f293ccd9c3992dc962c440c028d905fdc9939e9 (patch) | |
| tree | 08cf6fb42f0565555547715fc3b886d7af56b03b /functions | |
| parent | 06dac65ee377e081a4285590952fb8e13674f5b8 (diff) | |
| download | vyos-live-build-8f293ccd9c3992dc962c440c028d905fdc9939e9.tar.gz vyos-live-build-8f293ccd9c3992dc962c440c028d905fdc9939e9.zip | |
Dropping now unused intermediate config/image.
Diffstat (limited to 'functions')
| -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 ff268ba0b..fb2894c4d 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -36,22 +36,22 @@ New_configuration () ## Configuration # Configuration-Version - LIVE_CONFIGURATION_VERSION="${LIVE_CONFIGURATION_VERSION:-$(Get_configuration config/image Configuration-Version)}" + LIVE_CONFIGURATION_VERSION="${LIVE_CONFIGURATION_VERSION:-$(Get_configuration config/build Configuration-Version)}" LIVE_CONFIGURATION_VERSION="${LIVE_CONFIGURATION_VERSION:-${LIVE_BUILD_VERSION}}" export LIVE_CONFIGURATION_VERSION # Image: Name - LIVE_IMAGE_NAME="${LIVE_IMAGE_NAME:-$(Get_configuration config/image Name)}" + LIVE_IMAGE_NAME="${LIVE_IMAGE_NAME:-$(Get_configuration config/build Name)}" LIVE_IMAGE_NAME="${LIVE_IMAGE_NAME:-live-image}" export LIVE_IMAGE_NAME # Image: Architecture (FIXME: Support and default to 'any') - LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE:-$(Get_configuration config/image Architecture)}" + LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE:-$(Get_configuration config/build Architecture)}" LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE:-${CURRENT_IMAGE_ARCHITECTURE}}" export LIVE_IMAGE_ARCHITECTURE # Image: Archive Areas - LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-$(Get_configuration config/image Archive-Areas)}" + LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-$(Get_configuration config/build 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="${LIVE_IMAGE_PARENT_ARCHIVE_AREAS:-$(Get_configuration config/image Parent-Archive-Areas)}" + LIVE_IMAGE_PARENT_ARCHIVE_AREAS="${LIVE_IMAGE_PARENT_ARCHIVE_AREAS:-$(Get_configuration config/build 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="${LIVE_IMAGE_TYPE:-$(Get_configuration config/image Type)}" + LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-$(Get_configuration config/build Type)}" LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-iso-hybrid}" export LIVE_IMAGE_TYPE } |