diff options
| author | Christian Breunig <christian@breunig.cc> | 2023-11-11 13:04:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-11 13:04:38 +0100 |
| commit | 9f92b9ff69477fa93a87f49666a1f7b79949d585 (patch) | |
| tree | 8a8dd70128f973f5828060aae3db9975d902184b | |
| parent | b8b3a39449a98f1ca6d3e0b6d65b59ffc3edcfab (diff) | |
| parent | 0054e17282c7317182d2d710f9f129a179e99364 (diff) | |
| download | vyos-1x-9f92b9ff69477fa93a87f49666a1f7b79949d585.tar.gz vyos-1x-9f92b9ff69477fa93a87f49666a1f7b79949d585.zip | |
Merge pull request #2473 from vyos/mergify/bp/sagitta/pr-2472
dhclient: T5724: run user hooks using run_hookdir (backport #2472)
| -rw-r--r-- | src/etc/dhcp/dhclient-enter-hooks.d/99-run-user-hooks | 2 | ||||
| -rwxr-xr-x | src/etc/dhcp/dhclient-exit-hooks.d/98-run-user-hooks | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/etc/dhcp/dhclient-enter-hooks.d/99-run-user-hooks b/src/etc/dhcp/dhclient-enter-hooks.d/99-run-user-hooks index b4b4d516d..570758be6 100644 --- a/src/etc/dhcp/dhclient-enter-hooks.d/99-run-user-hooks +++ b/src/etc/dhcp/dhclient-enter-hooks.d/99-run-user-hooks @@ -1,5 +1,5 @@ #!/bin/bash DHCP_PRE_HOOKS="/config/scripts/dhcp-client/pre-hooks.d/" if [ -d "${DHCP_PRE_HOOKS}" ] ; then - run-parts "${DHCP_PRE_HOOKS}" + run_hookdir "${DHCP_PRE_HOOKS}" fi diff --git a/src/etc/dhcp/dhclient-exit-hooks.d/98-run-user-hooks b/src/etc/dhcp/dhclient-exit-hooks.d/98-run-user-hooks index 442419d79..910b586f0 100755 --- a/src/etc/dhcp/dhclient-exit-hooks.d/98-run-user-hooks +++ b/src/etc/dhcp/dhclient-exit-hooks.d/98-run-user-hooks @@ -1,5 +1,5 @@ #!/bin/bash DHCP_POST_HOOKS="/config/scripts/dhcp-client/post-hooks.d/" if [ -d "${DHCP_POST_HOOKS}" ] ; then - run-parts "${DHCP_POST_HOOKS}" + run_hookdir "${DHCP_POST_HOOKS}" fi |