diff options
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rwxr-xr-x | scripts/rl-system.init | 9 |
2 files changed, 19 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index c8b1a1fc..16150eaa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +vyatta-cfg-system (0.19.76) unstable; urgency=low + + * eliminate hard-coded commit hook directory + + -- An-Cheng Huang <ancheng@vyatta.com> Mon, 16 May 2011 20:11:38 -0700 + +vyatta-cfg-system (0.19.75) unstable; urgency=low + + * smp-affinity: fix typo for assign_multiqueue + + -- Stephen Hemminger <stephen.hemminger@vyatta.com> Mon, 16 May 2011 16:24:57 -0700 + vyatta-cfg-system (0.19.74) unstable; urgency=low [ Stephen Hemminger ] diff --git a/scripts/rl-system.init b/scripts/rl-system.init index d6f974f7..20534897 100755 --- a/scripts/rl-system.init +++ b/scripts/rl-system.init @@ -206,8 +206,13 @@ start () { fi done - # Remove links from the commit hook directory - rm -f /etc/commit/* + # Remove links from the post-commit hooks directory. + # 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) + if [ -d "$cpostdir" ]; then + rm -f $cpostdir/* + fi ## Clear out apt config file--it will be filled in by config load empty /etc/apt/sources.list |