summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2014-08-25 23:00:56 +0200
committerDaniel Baumann <mail@daniel-baumann.ch>2014-08-26 00:59:37 +0200
commit5203e46e9df67ef6ad463b82dbcb39d567deb91f (patch)
tree62258e3e42ef52cb0d10cb44e25308da09aa9ca6 /functions
parentb78f2db21dfd274cc69efaa830e398117cc21637 (diff)
downloadvyos-live-build-5203e46e9df67ef6ad463b82dbcb39d567deb91f.tar.gz
vyos-live-build-5203e46e9df67ef6ad463b82dbcb39d567deb91f.zip
Making configuration names in build.conf all lower case.
Diffstat (limited to 'functions')
-rwxr-xr-xfunctions/defaults.sh36
1 files changed, 18 insertions, 18 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 05524c360..e593a60f7 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -11,65 +11,65 @@
New_configuration ()
{
# Version
- LIVE_CONFIGURATION_VERSION="${LIVE_CONFIGURATION_VERSION:-$(Get_configuration config/build.conf Version)}"
+ LIVE_CONFIGURATION_VERSION="${LIVE_CONFIGURATION_VERSION:-$(Get_configuration config/build.conf version)}"
export LIVE_CONFIGURATION_VERSION
# Name
- LIVE_IMAGE_NAME="${LIVE_IMAGE_NAME:-$(Get_configuration config/build.conf Name)}"
+ LIVE_IMAGE_NAME="${LIVE_IMAGE_NAME:-$(Get_configuration config/build.conf name)}"
LIVE_IMAGE_NAME="${LIVE_IMAGE_NAME:-live-image}" # FIXME
export LIVE_IMAGE_NAME
# Architecture (FIXME: Support and default to 'any')
- LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE:-$(Get_configuration config/build.conf Architecture)}"
+ LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE:-$(Get_configuration config/build.conf architecture)}"
export LIVE_IMAGE_ARCHITECTURE
# Archive Areas
- LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-$(Get_configuration config/build.conf Archive-Areas)}"
+ LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-$(Get_configuration config/build.conf archive-areas)}"
export LIVE_IMAGE_ARCHIVE_AREAS
# Archive Areas
- LIVE_IMAGE_PARENT_ARCHIVE_AREAS="${LIVE_IMAGE_PARENT_ARCHIVE_AREAS:-$(Get_configuration config/build.conf Parent-Archive-Areas)}"
+ LIVE_IMAGE_PARENT_ARCHIVE_AREAS="${LIVE_IMAGE_PARENT_ARCHIVE_AREAS:-$(Get_configuration config/build.conf parent-archive-areas)}"
export LIVE_IMAGE_PARENT_ARCHIVE_AREAS
# Type
- LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-$(Get_configuration config/build.conf Type)}"
+ LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-$(Get_configuration config/build.conf type)}"
export LIVE_IMAGE_TYPE
# Mirrors
- LB_MIRROR_BOOTSTRAP="$(Get_configuration config/build.conf Mirror-Bootstrap)"
+ LB_MIRROR_BOOTSTRAP="$(Get_configuration config/build.conf mirror-bootstrap)"
export LB_MIRROR_BOOTSTRAP
- LB_PARENT_MIRROR_BOOTSTRAP="$(Get_configuration config/build.conf Parent-Mirror-Bootstrap)"
+ LB_PARENT_MIRROR_BOOTSTRAP="$(Get_configuration config/build.conf parent-mirror-bootstrap)"
export LB_PARENT_MIRROR_BOOTSTRAP
- LB_MIRROR_CHROOT="$(Get_configuration config/build.conf Mirror-Chroot)"
+ LB_MIRROR_CHROOT="$(Get_configuration config/build.conf mirror-chroot)"
export LB_MIRROR_CHROOT
- LB_PARENT_MIRROR_CHROOT="$(Get_configuration config/build.conf Parent-Mirror-Chroot)"
+ LB_PARENT_MIRROR_CHROOT="$(Get_configuration config/build.conf parent-mirror-chroot)"
export LB_MIRROR_CHROOT
- LB_MIRROR_CHROOT_SECURITY="$(Get_configuration config/build.conf Mirror-Chroot-Security)"
+ LB_MIRROR_CHROOT_SECURITY="$(Get_configuration config/build.conf mirror-chroot-security)"
export LB_MIRROR_CHROOT_SECURITY
- LB_PARENT_MIRROR_CHROOT_SECURITY="$(Get_configuration config/build.conf Parent-Mirror-Chroot-Security)"
+ LB_PARENT_MIRROR_CHROOT_SECURITY="$(Get_configuration config/build.conf parent-mirror-chroot-security)"
export LB_PARENT_MIRROR_CHROOT_SECURITY
- LB_MIRROR_BINARY="$(Get_configuration config/build.conf Mirror-Binary)"
+ LB_MIRROR_BINARY="$(Get_configuration config/build.conf mirror-binary)"
export LB_MIRROR_BINARY
- LB_PARENT_MIRROR_BINARY="$(Get_configuration config/build.conf Parent-Mirror-Binary)"
+ LB_PARENT_MIRROR_BINARY="$(Get_configuration config/build.conf parent-mirror-binary)"
export LB_PARENT_MIRROR_BINARY
- LB_MIRROR_BINARY_SECURITY="$(Get_configuration config/build.conf Mirror-Binary-Security)"
+ LB_MIRROR_BINARY_SECURITY="$(Get_configuration config/build.conf mirror-binary-security)"
export LB_MIRROR_BINARY_SECURITY
- LB_PARENT_MIRROR_BINARY_SECURITY="$(Get_configuration config/build.conf Parent-Mirror-Binary-Security)"
+ LB_PARENT_MIRROR_BINARY_SECURITY="$(Get_configuration config/build.conf parent-mirror-binary-security)"
export LB_PARENT_MIRROR_BINARY_SECURITY
- LB_MIRROR_DEBIAN_INSTALLER="$(Get_configuration config/build.conf Mirror-Installer)"
+ LB_MIRROR_DEBIAN_INSTALLER="$(Get_configuration config/build.conf mirror-installer)"
export LB_MIRROR_DEBIAN_INSTALLER
- LB_PARENT_MIRROR_DEBIAN_INSTALLER="$(Get_configuration config/build.conf Parent-Mirror-Installer)"
+ LB_PARENT_MIRROR_DEBIAN_INSTALLER="$(Get_configuration config/build.conf parent-mirror-installer)"
export LB_PARENT_MIRROR_DEBIAN_INSTALLER
}