diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-12-19 12:07:10 +0100 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2013-05-06 14:50:03 +0200 |
| commit | 3cb7d3163af3f3e01bb974a57e71ee68ed1166a9 (patch) | |
| tree | 4de09bd6cade9ac024f9af7e8f392e3ccd1cbc02 /functions | |
| parent | 8c0760a13af6f7856d7d8cc8b2459a9340ad9548 (diff) | |
| download | vyos-live-build-3cb7d3163af3f3e01bb974a57e71ee68ed1166a9.tar.gz vyos-live-build-3cb7d3163af3f3e01bb974a57e71ee68ed1166a9.zip | |
Correcting architecture defaults.
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/defaults.sh | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index ff5e1a1fa..494775ef6 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -10,27 +10,6 @@ New_configuration () { - ## Configuration - - # 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 - #LIVE_IMAGE="$(Get_configuration config/control Image)" - #LIVE_IMAGE="${LIVE_IMAGE:-binary}" - - # Image: Architecture - LIVE_IMAGE_ARCHITECTURE="$(Get_configuration config/control Architecture)" - LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE:-any}" - export LIVE_IMAGE_ARCHITECTURE - - # Image: Type - LIVE_IMAGE_TYPE="$(Get_configuration config/control Type)" - LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-iso-hybrid}" - export LIVE_IMAGE_TYPE - ## Runtime # Image: Architecture @@ -52,6 +31,28 @@ New_configuration () ;; esac fi + + + ## Configuration + + # 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 + #LIVE_IMAGE="$(Get_configuration config/control Image)" + #LIVE_IMAGE="${LIVE_IMAGE:-binary}" + + # Image: Architecture (FIXME: Support and default to 'any') + LIVE_IMAGE_ARCHITECTURE="$(Get_configuration config/control Architecture)" + LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE:-${CURRENT_IMAGE_ARCHITECTURE}}" + export LIVE_IMAGE_ARCHITECTURE + + # Image: Type + LIVE_IMAGE_TYPE="$(Get_configuration config/control Type)" + LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-iso-hybrid}" + export LIVE_IMAGE_TYPE } Set_defaults () |