From 7d2cb6d35ebb527e9bb279c0aef78b38d2c52b0f Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 1 Sep 2014 00:17:22 +0200 Subject: [PATCH] Move config hooks into a separate directory --- Makefile.am | 7 +++++++ src/hooks/{zones/bridge.configs => configs}/ipv4-dhcp | 0 src/hooks/{zones/bridge.configs => configs}/ipv4-static | 0 src/hooks/{zones/bridge.configs => configs}/ipv6-static | 0 src/hooks/{zones/bridge.configs => configs}/pppoe-server | 0 src/hooks/zones/wireless.configs/ipv4-dhcp | 1 - src/hooks/zones/wireless.configs/ipv4-static | 1 - src/hooks/zones/wireless.configs/ipv6-static | 1 - 8 files changed, 7 insertions(+), 3 deletions(-) rename src/hooks/{zones/bridge.configs => configs}/ipv4-dhcp (100%) rename src/hooks/{zones/bridge.configs => configs}/ipv4-static (100%) rename src/hooks/{zones/bridge.configs => configs}/ipv6-static (100%) rename src/hooks/{zones/bridge.configs => configs}/pppoe-server (100%) delete mode 120000 src/hooks/zones/wireless.configs/ipv4-dhcp delete mode 120000 src/hooks/zones/wireless.configs/ipv4-static delete mode 120000 src/hooks/zones/wireless.configs/ipv6-static diff --git a/Makefile.am b/Makefile.am index 2b86f868..d49d37ba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,6 +41,7 @@ helpersdir = $(networkdir)/helpers macrosdir = $(libexecdir)/firewall/macros hooksdir = $(networkdir)/hooks +hooks_configsdir = $(hooksdir)/configs hooks_portsdir = $(hooksdir)/ports hooks_zonesdir = $(hooksdir)/zones @@ -179,6 +180,12 @@ bridge-stp-uninstall-hook: INSTALL_EXEC_HOOKS += bridge-stp-install-hook UNINSTALL_EXEC_HOOKS += bridge-stp-uninstall-hook +dist_hooks_configs_SCRIPTS = \ + src/hooks/configs/ipv4-dhcp \ + src/hooks/configs/ipv6-static \ + src/hooks/configs/ipv4-static \ + src/hooks/configs/pppoe-server + dist_hooks_ports_SCRIPTS = \ src/hooks/ports/batman-adv \ src/hooks/ports/batman-adv-port \ diff --git a/src/hooks/zones/bridge.configs/ipv4-dhcp b/src/hooks/configs/ipv4-dhcp similarity index 100% rename from src/hooks/zones/bridge.configs/ipv4-dhcp rename to src/hooks/configs/ipv4-dhcp diff --git a/src/hooks/zones/bridge.configs/ipv4-static b/src/hooks/configs/ipv4-static similarity index 100% rename from src/hooks/zones/bridge.configs/ipv4-static rename to src/hooks/configs/ipv4-static diff --git a/src/hooks/zones/bridge.configs/ipv6-static b/src/hooks/configs/ipv6-static similarity index 100% rename from src/hooks/zones/bridge.configs/ipv6-static rename to src/hooks/configs/ipv6-static diff --git a/src/hooks/zones/bridge.configs/pppoe-server b/src/hooks/configs/pppoe-server similarity index 100% rename from src/hooks/zones/bridge.configs/pppoe-server rename to src/hooks/configs/pppoe-server diff --git a/src/hooks/zones/wireless.configs/ipv4-dhcp b/src/hooks/zones/wireless.configs/ipv4-dhcp deleted file mode 120000 index 5092ad19..00000000 --- a/src/hooks/zones/wireless.configs/ipv4-dhcp +++ /dev/null @@ -1 +0,0 @@ -../bridge.configs/ipv4-dhcp \ No newline at end of file diff --git a/src/hooks/zones/wireless.configs/ipv4-static b/src/hooks/zones/wireless.configs/ipv4-static deleted file mode 120000 index d81c3af3..00000000 --- a/src/hooks/zones/wireless.configs/ipv4-static +++ /dev/null @@ -1 +0,0 @@ -../bridge.configs/ipv4-static \ No newline at end of file diff --git a/src/hooks/zones/wireless.configs/ipv6-static b/src/hooks/zones/wireless.configs/ipv6-static deleted file mode 120000 index dac121f1..00000000 --- a/src/hooks/zones/wireless.configs/ipv6-static +++ /dev/null @@ -1 +0,0 @@ -../bridge.configs/ipv6-static \ No newline at end of file -- 2.39.2