From 61f80b4f9b568f2f5b4d2cbd04de0b7fb7a9bffa Mon Sep 17 00:00:00 2001 From: Ivan Davidov Date: Mon, 4 Dec 2017 17:40:36 +0200 Subject: [PATCH] Use local configuration (static-get). --- src/.config | 7 ------- src/minimal_overlay/bundles/static_get/.config | 6 ++++++ src/minimal_overlay/bundles/static_get/01_get.sh | 8 +++----- 3 files changed, 9 insertions(+), 12 deletions(-) create mode 100644 src/minimal_overlay/bundles/static_get/.config diff --git a/src/.config b/src/.config index e79fbd328..bb615f2ce 100644 --- a/src/.config +++ b/src/.config @@ -41,13 +41,6 @@ SYSLINUX_SOURCE_URL=http://kernel.org/pub/linux/utils/boot/syslinux/syslinux-6.0 # # ##################################################################### -# You can find the latest static-get shell script here: -# -# http://s.minos.io/s -# http://github.com/minos-org/minos-static -# -STATIC_GET_SOURCE_URL=http://s.minos.io/s - # You can find the latest stress archives here: # # https://people.seas.harvard.edu/~apw/stress/ diff --git a/src/minimal_overlay/bundles/static_get/.config b/src/minimal_overlay/bundles/static_get/.config new file mode 100644 index 000000000..5c4ac1356 --- /dev/null +++ b/src/minimal_overlay/bundles/static_get/.config @@ -0,0 +1,6 @@ +# You can find the latest static-get shell script here: +# +# http://s.minos.io/s +# http://github.com/minos-org/minos-static +# +STATIC_GET_URL=http://s.minos.io/s diff --git a/src/minimal_overlay/bundles/static_get/01_get.sh b/src/minimal_overlay/bundles/static_get/01_get.sh index 9fd50400b..c1b53c507 100755 --- a/src/minimal_overlay/bundles/static_get/01_get.sh +++ b/src/minimal_overlay/bundles/static_get/01_get.sh @@ -4,11 +4,9 @@ set -e . ../../common.sh -# Grab everything after the '=' character. -DOWNLOAD_URL=$(grep -i STATIC_GET_SOURCE_URL $MAIN_SRC_DIR/.config | cut -f2 -d'=') - -# Read the 'USE_LOCAL_SOURCE' property from '.config' -USE_LOCAL_SOURCE="$(grep -i USE_LOCAL_SOURCE $MAIN_SRC_DIR/.config | cut -f2 -d'=')" +# Read the common configuration properties. +DOWNLOAD_URL=`read_property STATIC_GET_URL` +USE_LOCAL_SOURCE=`read_property USE_LOCAL_SOURCE` if [ "$USE_LOCAL_SOURCE" = "true" -a ! -f $MAIN_SRC_DIR/source/overlay/static-get.sh ] ; then echo "Shell script $MAIN_SRC_DIR/source/overlay/static-get.sh is missing and will be downloaded."