summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-12-19 12:21:09 +0100
committerDaniel Baumann <mail@daniel-baumann.ch>2013-05-06 14:50:03 +0200
commit2a9486d108408006959bb77cac37f9eb0612728a (patch)
tree187ea8854beb1e93e3493d603ba24d9cafa15d06 /functions
parent3cb7d3163af3f3e01bb974a57e71ee68ed1166a9 (diff)
downloadvyos-live-build-2a9486d108408006959bb77cac37f9eb0612728a.tar.gz
vyos-live-build-2a9486d108408006959bb77cac37f9eb0612728a.zip
Using image name from configuration to name binary output files.
Diffstat (limited to 'functions')
-rwxr-xr-xfunctions/defaults.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 494775ef6..3f42cfe08 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -41,8 +41,9 @@ New_configuration ()
export LIVE_CONFIGURATION_VERSION
# Image
- #LIVE_IMAGE="$(Get_configuration config/control Image)"
- #LIVE_IMAGE="${LIVE_IMAGE:-binary}"
+ LIVE_IMAGE_NAME="$(Get_configuration config/control Name)"
+ LIVE_IMAGE_NAME="${LIVE_IMAGE_NAME:-live}"
+ export LIVE_IMAGE_NAME
# Image: Architecture (FIXME: Support and default to 'any')
LIVE_IMAGE_ARCHITECTURE="$(Get_configuration config/control Architecture)"