From 8f293ccd9c3992dc962c440c028d905fdc9939e9 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <mail@daniel-baumann.ch>
Date: Sat, 6 Apr 2013 10:46:04 +0200
Subject: Dropping now unused intermediate config/image.

---
 scripts/build/config | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

(limited to 'scripts')

diff --git a/scripts/build/config b/scripts/build/config
index c5de3fc2b..7fb50542a 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -1379,21 +1379,6 @@ 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/image ]
-then
-	_NEW_CONFIG="true"
-fi
-
-# 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}"
-
-# config/build
 cat > config/build << EOF
 [Image]
 Architecture: ${LIVE_IMAGE_ARCHITECTURE}
@@ -1406,6 +1391,7 @@ if [ "${LB_DERIVATIVE}" = "true" ]
 then
 
 cat >> config/build << EOF
+
 Parent-Archive-Areas: ${LIVE_IMAGE_ARCHIVE_AREAS}
 Parent-Distribution: ${LB_DISTRIBUTION}
 Parent-Mirror-Bootstrap: ${LB_PARENT_MIRROR_BOOTSTRAP}
@@ -1413,5 +1399,13 @@ EOF
 
 fi
 
+cat >> config/build << EOF
+
+[FIXME]
+Configuration-Version: ${LIVE_CONFIGURATION_VERSION}
+Name: ${LIVE_IMAGE_NAME}
+Type: ${LIVE_IMAGE_TYPE}
+EOF
+
 # Creating stage file
 Create_stagefile .build/config
-- 
cgit v1.2.3