From 778fadeb4e97b1fdc88a30545536a96f1a2cc0cd Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Fri, 8 Jan 2021 16:20:57 +0800 Subject: [PATCH] ipv6helper: set ipv6 under hybrid mode by default --- package/lean/ipv6-helper/Makefile | 15 ++++----------- .../files/{root/etc/hotplug.d/iface => }/60-6in4 | 0 package/lean/ipv6-helper/files/60-ipv6-hybrid | 9 +++++++++ 3 files changed, 13 insertions(+), 11 deletions(-) rename package/lean/ipv6-helper/files/{root/etc/hotplug.d/iface => }/60-6in4 (100%) create mode 100755 package/lean/ipv6-helper/files/60-ipv6-hybrid diff --git a/package/lean/ipv6-helper/Makefile b/package/lean/ipv6-helper/Makefile index c0825bef22..1a41c02be4 100644 --- a/package/lean/ipv6-helper/Makefile +++ b/package/lean/ipv6-helper/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ipv6helper PKG_VERSION:=1.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_LICENSE:=GPLv3 PKG_LICENSE_FILES:=LICENSE @@ -39,18 +39,11 @@ endef define Build/Compile endef -define Package/ipv6helper/postinst -#!/bin/sh -if [ -z "$${IPKG_INSTROOT}" ]; then - chmod 755 /etc/hotplug.d/iface/60-6in4 >/dev/null 2>&1 -fi -exit 0 -endef - define Package/ipv6helper/install $(INSTALL_DIR) $(1)/etc/hotplug.d/iface - $(INSTALL_BIN) ./files/root/etc/hotplug.d/iface/60-6in4 $(1)/etc/hotplug.d/iface/60-6in4 + $(INSTALL_BIN) ./files/60-6in4 $(1)/etc/hotplug.d/iface/60-6in4 + $(INSTALL_DIR) $(1)/etc/uci-defaults + $(INSTALL_BIN) ./files/60-ipv6-hybrid $(1)/etc/uci-defaults/60-ipv6-hybrid endef - $(eval $(call BuildPackage,ipv6helper)) diff --git a/package/lean/ipv6-helper/files/root/etc/hotplug.d/iface/60-6in4 b/package/lean/ipv6-helper/files/60-6in4 similarity index 100% rename from package/lean/ipv6-helper/files/root/etc/hotplug.d/iface/60-6in4 rename to package/lean/ipv6-helper/files/60-6in4 diff --git a/package/lean/ipv6-helper/files/60-ipv6-hybrid b/package/lean/ipv6-helper/files/60-ipv6-hybrid new file mode 100755 index 0000000000..e6450b259a --- /dev/null +++ b/package/lean/ipv6-helper/files/60-ipv6-hybrid @@ -0,0 +1,9 @@ +#!/bin/sh + +uci set dhcp.lan.ra='hybrid' +uci set dhcp.lan.ndp='hybrid' +uci set dhcp.lan.dhcpv6='hybrid' +uci set dhcp.lan.ra_management='1' +uci commit dhcp + +exit 0