From 332dd196cad4fa1a9b0257b08091b902efa5a7c2 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 22 Jul 2011 15:02:48 -0300 Subject: [PATCH] iptables: fixup multitarget binary links Newer vesions renamed iptables-multi to xtables-multi so fix the symlinks accordingly. Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/iptables/iptables.mk | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk index 13d2ac309..c464e6b48 100644 --- a/package/iptables/iptables.mk +++ b/package/iptables/iptables.mk @@ -14,15 +14,15 @@ IPTABLES_DEPENDENCIES = host-pkg-config IPTABLES_CONF_OPT = --libexecdir=/usr/lib --with-kernel=$(LINUX_HEADERS_DIR) define IPTABLES_TARGET_SYMLINK_CREATE - ln -sf iptables-multi $(TARGET_DIR)/usr/sbin/iptables - ln -sf iptables-multi $(TARGET_DIR)/usr/sbin/iptables-save - ln -sf iptables-multi $(TARGET_DIR)/usr/sbin/iptables-restore + ln -sf xtables-multi $(TARGET_DIR)/usr/sbin/iptables + ln -sf xtables-multi $(TARGET_DIR)/usr/sbin/iptables-save + ln -sf xtables-multi $(TARGET_DIR)/usr/sbin/iptables-restore endef define IPTABLES_TARGET_IPV6_SYMLINK_CREATE - ln -sf ip6tables-multi $(TARGET_DIR)/usr/sbin/ip6tables - ln -sf ip6tables-multi $(TARGET_DIR)/usr/sbin/ip6tables-save - ln -sf ip6tables-multi $(TARGET_DIR)/usr/sbin/ip6tables-restore + ln -sf xtables-multi $(TARGET_DIR)/usr/sbin/ip6tables + ln -sf xtables-multi $(TARGET_DIR)/usr/sbin/ip6tables-save + ln -sf xtables-multi $(TARGET_DIR)/usr/sbin/ip6tables-restore endef define IPTABLES_TARGET_IPV6_REMOVE @@ -40,6 +40,7 @@ endif define IPTABLES_UNINSTALL_TARGET_CMDS rm -f $(TARGET_DIR)/usr/bin/iptables-xml rm -f $(TARGET_DIR)/usr/sbin/iptables* $(TARGET_DIR)/usr/sbin/ip6tables* + rm -f $(TARGET_DIR)/usr/sbin/xtables-multi rm -rf $(TARGET_DIR)/usr/lib/xtables endef