summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2008-11-01 15:10:34 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:03:44 +0100
commit776a7b22271178949bf6f2676e26eefb6144ce11 (patch)
tree227a951f77a1a6721d1ffd49b7a1cb897f0c9dc4
parentad6b01b388767f2efd39e4b4f10974461fc5220d (diff)
downloadvyos-live-build-776a7b22271178949bf6f2676e26eefb6144ce11.tar.gz
vyos-live-build-776a7b22271178949bf6f2676e26eefb6144ce11.zip
Generalizing internal LH_BREAKPOINTS variable.
-rwxr-xr-xfunctions/arguments.sh2
-rwxr-xr-xfunctions/breakpoints.sh2
-rwxr-xr-xfunctions/defaults.sh2
-rwxr-xr-xhelpers/lh_config13
4 files changed, 7 insertions, 12 deletions
diff --git a/functions/arguments.sh b/functions/arguments.sh
index 3d0d869ed..70f397c70 100755
--- a/functions/arguments.sh
+++ b/functions/arguments.sh
@@ -23,7 +23,7 @@ Arguments ()
do
case "${1}" in
--breakpoints)
- LH_BREAKPOINTS="enabled"
+ _BREAKPOINTS="enabled"
shift
;;
diff --git a/functions/breakpoints.sh b/functions/breakpoints.sh
index feaaea7cd..1e4fdb21b 100755
--- a/functions/breakpoints.sh
+++ b/functions/breakpoints.sh
@@ -11,7 +11,7 @@ Breakpoint ()
{
NAME="${1}"
- if [ "${LH_BREAKPOINTS}" = "enabled" ]
+ if [ "${_BREAKPOINTS}" = "enabled" ]
then
Echo_message "Waiting at %s" "${NAME}"
read WAIT
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 281bed484..4592d2163 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -220,7 +220,7 @@ Set_defaults ()
fi
# Setting live helper options
- LH_BREAKPOINTS="${LH_BREAKPOINTS:-disabled}"
+ _BREAKPOINTS="${_BREAKPOINTS:-disabled}"
_DEBUG="${_DEBUG:-disabled}"
_FORCE="${_FORCE:-disabled}"
_QUIET="${_QUIET:-disabled}"
diff --git a/helpers/lh_config b/helpers/lh_config
index 480f3f3f6..5911a91dd 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -317,11 +317,6 @@ Local_arguments ()
shift 2
;;
- --breakpoints)
- LH_BREAKPOINTS="enabled"
- shift
- ;;
-
-v|--version)
Version
shift
@@ -643,7 +638,7 @@ Local_arguments ()
# other
--breakpoints)
- LH_BREAKPOINTS="enabled"
+ _BREAKPOINTS="enabled"
shift
;;
@@ -834,9 +829,9 @@ LH_TEMPLATES="${LH_TEMPLATES}"
# Live-helper options
-# \$LH_BREAKPOINTS: enable breakpoints
-# (Default: ${LH_BREAKPOINTS})
-#LH_BREAKPOINTS="${LH_BREAKPOINTS}"
+# \$_BREAKPOINTS: enable breakpoints
+# (Default: ${_BREAKPOINTS})
+#_BREAKPOINTS="${_BREAKPOINTS}"
# \$_DEBUG: enable debug
# (Default: ${_DEBUG})