summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2013-11-06 09:48:30 +0100
committerDaniel Baumann <mail@daniel-baumann.ch>2013-11-06 09:48:30 +0100
commitaeaaf8709e1446c76295c84876ab5d8bd267d2d7 (patch)
treeefb50ec0cdad7cec6a365818f0d82751757865ca
parent038b1fa8f627bb83c060f17db3e100b541de8df7 (diff)
downloadvyos-live-build-aeaaf8709e1446c76295c84876ab5d8bd267d2d7.tar.gz
vyos-live-build-aeaaf8709e1446c76295c84876ab5d8bd267d2d7.zip
Moving live-build development disclaimer message from lb-config to lb-init.
-rwxr-xr-xcomponents/init11
-rwxr-xr-xscripts/build/config13
2 files changed, 11 insertions, 13 deletions
diff --git a/components/init b/components/init
index a54c8e756..ca3fa8560 100755
--- a/components/init
+++ b/components/init
@@ -77,6 +77,17 @@ def main():
# * until further tests, we do not allow to re-run lb init on an already initialized directory.
sys.exit(0)
+ # Print warning about live-build development version
+ print('WARNING: THIS VERSION OF LIVE-BUILD IS EXPERIMENTAL\n')
+
+ print('IT IS UNFINISHED AND CHANGES HEAVILY WITHOUT PRIOR NOTICE.')
+ print('USER DISCRETION IS ADVISED.\n')
+
+ print('Please also note that you are running a live-build development version')
+ print('and that we are only supporting the newest development version.\n')
+
+ print('Make sure you are using the newest version at all times.')
+
# Configuring default archive-keys
if (project == 'progress-linux'):
# dependencies
diff --git a/scripts/build/config b/scripts/build/config
index 822e265b0..f4194fcb7 100755
--- a/scripts/build/config
+++ b/scripts/build/config
@@ -1337,19 +1337,6 @@ then
rmdir --ignore-fail-on-non-empty local > /dev/null 2>&1 || true
fi
-if echo "${VERSION}" | grep -qs "alpha"
-then
- # live-build alpha version
- 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."
- Echo_warning ""
- Echo_warning "Please also note that you are running a live-build development version"
- Echo_warning "and that we are only supporting the newest development version."
- Echo_warning ""
- Echo_warning "Make sure you are using the newest version at all times."
-fi
-
cat > config/build << EOF
[Image]
Architecture: ${LIVE_IMAGE_ARCHITECTURE}