summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorjnqnfe <jnqnfe@gmail.com>2015-02-05 03:30:47 +0000
committerLuca Boccassi <bluca@debian.org>2020-03-10 12:39:37 +0000
commit061d7cb3406c99a8bbb7b563625fe00357ba90aa (patch)
tree3ea895f03cb6323a2fc49404a5c7cbc6beeb6c62 /functions
parentb49abcc1a8002c52b45c3e3da6723097f99c26e6 (diff)
downloadvyos-live-build-061d7cb3406c99a8bbb7b563625fe00357ba90aa.tar.gz
vyos-live-build-061d7cb3406c99a8bbb7b563625fe00357ba90aa.zip
tidy script init (2/4) - build stage scripts
Partial fix for #952919 Gbp-Dch: Short
Diffstat (limited to 'functions')
-rwxr-xr-xfunctions/exit.sh4
-rwxr-xr-xfunctions/init.sh9
2 files changed, 11 insertions, 2 deletions
diff --git a/functions/exit.sh b/functions/exit.sh
index 31d82a14d..0aa334a5c 100755
--- a/functions/exit.sh
+++ b/functions/exit.sh
@@ -56,8 +56,8 @@ Exit ()
return ${VALUE}
}
-Setup_cleanup ()
+Setup_clean_exit ()
{
- Echo_message "Setting up cleanup function"
+ Echo_message "Setting up clean exit handler"
trap 'Exit' EXIT HUP INT QUIT TERM
}
diff --git a/functions/init.sh b/functions/init.sh
index eb73d02ae..753b9c6a3 100755
--- a/functions/init.sh
+++ b/functions/init.sh
@@ -13,6 +13,15 @@ Common_config_files ()
echo "config/all config/common config/bootstrap config/chroot config/binary config/source"
}
+Auto_build_config ()
+{
+ # Automatically build config
+ if [ -x auto/config ] && [ ! -e .build/config ]; then
+ Echo_message "Automatically populating config tree."
+ lb config
+ fi
+}
+
Init_config_data ()
{
Arguments "${@}"