diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2013-03-21 17:11:10 +0100 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2013-05-06 14:50:07 +0200 |
| commit | 60739bfbd8ffe3baea5a9e2efec848226b4f83b3 (patch) | |
| tree | 51e4d7f03c17f767500e266e297e5475acf99b48 | |
| parent | 68700f466c142082e7423282ca4caaf7552bf8e9 (diff) | |
| download | vyos-live-build-60739bfbd8ffe3baea5a9e2efec848226b4f83b3.tar.gz vyos-live-build-60739bfbd8ffe3baea5a9e2efec848226b4f83b3.zip | |
Renaming config/control to config/image.
| -rw-r--r-- | examples/gitignore | 2 | ||||
| -rwxr-xr-x | functions/defaults.sh | 12 | ||||
| -rwxr-xr-x | scripts/build/config | 17 |
3 files changed, 16 insertions, 15 deletions
diff --git a/examples/gitignore b/examples/gitignore index 3f88dfad1..918c4dffc 100644 --- a/examples/gitignore +++ b/examples/gitignore @@ -20,7 +20,7 @@ config/chroot config/common config/source -config/control +config/image source/ source*.iso diff --git a/functions/defaults.sh b/functions/defaults.sh index 352e51d11..f48f3684c 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/control Configuration-Version)}" + LIVE_CONFIGURATION_VERSION="${LIVE_CONFIGURATION_VERSION:-$(Get_configuration config/image 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/control Name)}" + LIVE_IMAGE_NAME="${LIVE_IMAGE_NAME:-$(Get_configuration config/image 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/control Architecture)}" + LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE:-$(Get_configuration config/image 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/control Archive-Areas)}" + LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-$(Get_configuration config/image 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/control Parent-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:-${LIVE_IMAGE_ARCHIVE_AREAS}}" export LIVE_IMAGE_PARENT_ARCHIVE_AREAS # Image: Type - LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-$(Get_configuration config/control Type)}" + LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-$(Get_configuration config/image Type)}" LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-iso-hybrid}" export LIVE_IMAGE_TYPE } diff --git a/scripts/build/config b/scripts/build/config index 0da7954ad..60396253c 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -1379,18 +1379,19 @@ Echo_warning "WARNING: THIS VERSION OF LIVE-BUILD IS EXPERIMENTAL!" Echo_warning "IT IS UNFINISHED AND CHANGES HEAVILY WITHOUT PRIOR NOTICE." Echo_warning "USER DISCRETION IS ADVISED." -if [ ! -e config/control ] +if [ ! -e config/image ] then _NEW_CONFIG="true" fi -Set_configuration "config/control" "Configuration-Version" "${LIVE_CONFIGURATION_VERSION}" -[ "${_NEW_CONFIG}" = "true" ] && echo "" >> config/control -Set_configuration "config/control" "Name" "${LIVE_IMAGE_NAME}" -Set_configuration "config/control" "Architecture" "${LIVE_IMAGE_ARCHITECTURE}" -Set_configuration "config/control" "Archive-Areas" "${LIVE_IMAGE_ARCHIVE_AREAS}" -[ "${LB_DERIVATIVE}" = "true" ] && Set_configuration "config/control" "Parent-Archive-Areas" "${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}" # FIXME -Set_configuration "config/control" "Type" "${LIVE_IMAGE_TYPE}" +# config/image +Set_configuration "config/image" "Configuration-Version" "${LIVE_CONFIGURATION_VERSION}" +[ "${_NEW_CONFIG}" = "true" ] && echo "" >> config/image +Set_configuration "config/image" "Name" "${LIVE_IMAGE_NAME}" +Set_configuration "config/image" "Architecture" "${LIVE_IMAGE_ARCHITECTURE}" +Set_configuration "config/image" "Archive-Areas" "${LIVE_IMAGE_ARCHIVE_AREAS}" +[ "${LB_DERIVATIVE}" = "true" ] && Set_configuration "config/image" "Parent-Archive-Areas" "${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}" # FIXME +Set_configuration "config/image" "Type" "${LIVE_IMAGE_TYPE}" # Creating stage file Create_stagefile .build/config |