summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStig Thormodsrud <stig@vyatta.com>2010-11-23 15:38:40 -0800
committerStig Thormodsrud <stig@vyatta.com>2010-11-23 15:38:40 -0800
commit2ffd41bc39e74d49e4e6d3d135c7a94dc1ebc43d (patch)
tree854389cf7ca1e85292b3b71a5b6175ff0c1eb997
parent169e819bb30fb23fd7dba83f76f8c0e89fa12bdd (diff)
downloadvyatta-cfg-2ffd41bc39e74d49e4e6d3d135c7a94dc1ebc43d.tar.gz
vyatta-cfg-2ffd41bc39e74d49e4e6d3d135c7a94dc1ebc43d.zip
Add COMMIT_VIA environment variable.
-rwxr-xr-xetc/bash_completion.d/20vyatta-cfg2
-rwxr-xr-xscripts/vyatta-cfg-cmd-wrapper2
2 files changed, 4 insertions, 0 deletions
diff --git a/etc/bash_completion.d/20vyatta-cfg b/etc/bash_completion.d/20vyatta-cfg
index d7b849c..110b563 100755
--- a/etc/bash_completion.d/20vyatta-cfg
+++ b/etc/bash_completion.d/20vyatta-cfg
@@ -115,9 +115,11 @@ commit ()
done
args+=("-C '$comment'")
+ export COMMIT_VIA=cli
if /opt/vyatta/sbin/my_commit "${args[@]}"; then
vyatta_cli_shell_api markSessionUnsaved
fi
+ unset COMMIT_VIA
}
commit-confirm ()
diff --git a/scripts/vyatta-cfg-cmd-wrapper b/scripts/vyatta-cfg-cmd-wrapper
index aa6bf01..569b68f 100755
--- a/scripts/vyatta-cfg-cmd-wrapper
+++ b/scripts/vyatta-cfg-cmd-wrapper
@@ -79,11 +79,13 @@ case "$1" in
RET_STATUS=$?
;;
commit)
+ export COMMIT_VIA=cfg-cmd-wrapper
# debug file /tmp/bar should be deleted before release
/opt/vyatta/sbin/my_commit -a >> /tmp/bar
/opt/vyatta/sbin/my_commit -s >> /tmp/bar
/opt/vyatta/sbin/my_commit -e -d >> /tmp/bar
RET_STATUS=$?
+ unset COMMIT_VIA
;;
commit_with_error)
/opt/vyatta/sbin/my_commit