summaryrefslogtreecommitdiff
path: root/scripts/rl-system.init
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@baturin.org>2015-06-29 00:56:29 +0200
committerDaniil Baturin <daniil@baturin.org>2015-06-29 00:56:29 +0200
commitbfa0be96e86d793e6978ce3f7750c3a21fec0ba4 (patch)
tree7ad12db9912ed1294e8e92d7205ca7b02f564867 /scripts/rl-system.init
parent0d53445cf639a4072e6d2ecd71da6c9f1c78d4b8 (diff)
parent06073474594426a2da5cb9907fc7587df56c0c23 (diff)
downloadvyatta-cfg-system-bfa0be96e86d793e6978ce3f7750c3a21fec0ba4.tar.gz
vyatta-cfg-system-bfa0be96e86d793e6978ce3f7750c3a21fec0ba4.zip
Merge branch 'lithium' of github.com:vyos/vyatta-cfg-system into lithium
Diffstat (limited to 'scripts/rl-system.init')
-rwxr-xr-xscripts/rl-system.init11
1 files changed, 10 insertions, 1 deletions
diff --git a/scripts/rl-system.init b/scripts/rl-system.init
index fac5fbc1..6a2b8d25 100755
--- a/scripts/rl-system.init
+++ b/scripts/rl-system.init
@@ -210,8 +210,17 @@ start () {
# note that this approach only supports hooks that are "configured",
# i.e., it does not support hooks that need to always be present.
cpostdir=$(cli-shell-api getPostCommitHookDir)
+
+ # exclude commits hooks from vyatta-cfg
+ excluded="10vyatta-log-commit.pl 99vyos-user-postcommit-hooks"
+
if [ -d "$cpostdir" ]; then
- rm -f $cpostdir/*
+ for f in $cpostdir/*
+ do
+ if [[ ! $excluded =~ $(basename $f) ]]; then
+ rm -f $cpostdir/$(basename $f)
+ fi
+ done
fi
## Clear out apt config file--it will be filled in by config load