summaryrefslogtreecommitdiff
path: root/scripts/build/config
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2013-03-21 17:11:10 +0100
committerDaniel Baumann <mail@daniel-baumann.ch>2013-05-06 14:50:07 +0200
commit60739bfbd8ffe3baea5a9e2efec848226b4f83b3 (patch)
tree51e4d7f03c17f767500e266e297e5475acf99b48 /scripts/build/config
parent68700f466c142082e7423282ca4caaf7552bf8e9 (diff)
downloadvyos-live-build-60739bfbd8ffe3baea5a9e2efec848226b4f83b3.tar.gz
vyos-live-build-60739bfbd8ffe3baea5a9e2efec848226b4f83b3.zip
Renaming config/control to config/image.
Diffstat (limited to 'scripts/build/config')
-rwxr-xr-xscripts/build/config17
1 files changed, 9 insertions, 8 deletions
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