From 9b5efe21f9acfa3caa9ed21aaa6f4e7b0e2fb9b4 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Tue, 9 Oct 2018 19:34:52 +0800 Subject: [PATCH] add default config to support NAPT66 NAT6 --- include/target.mk | 4 ++-- package/lean/default-settings/Makefile | 2 +- package/lean/default-settings/files/zzz-default-settings | 7 ++++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/target.mk b/include/target.mk index b4a4a5481f..28779c9d17 100644 --- a/include/target.mk +++ b/include/target.mk @@ -14,7 +14,7 @@ DEVICE_TYPE?=router # Default packages - the really basic set DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd fstools uclient-fetch logd block-mount \ -iptables-mod-nat-extra kmod-nf-nathelper kmod-nf-nathelper-extra kmod-ipt-raw kmod-macvlan kmod-nft-offload kmod-ipt-nat6 \ +iptables-mod-nat-extra kmod-nf-nathelper kmod-nf-nathelper-extra kmod-ipt-raw kmod-macvlan kmod-nft-offload \ default-settings luci luci-app-ddns luci-app-sqm luci-app-upnp luci-app-adbyby-plus luci-app-autoreboot \ luci-app-filetransfer luci-app-ssr-plus luci-app-usb-printer luci-app-vsftpd ddns-scripts_aliyun luci-app-xlnetacc \ luci-app-pptp-server luci-app-ipsec-vpnd luci-app-vlmcsd luci-app-wifischedule luci-app-wol \ @@ -22,7 +22,7 @@ luci-app-sfe luci-app-flowoffload luci-app-nlbwmon luci-app-wrtbwmon # For nas targets DEFAULT_PACKAGES.nas:=block-mount fdisk lsblk mdadm automount autosamba # For router targets -DEFAULT_PACKAGES.router:=dnsmasq-full iptables ip6tables ppp ppp-mod-pppoe firewall kmod-ipt-offload kmod-tcp-bbr +DEFAULT_PACKAGES.router:=dnsmasq-full iptables ip6tables ppp ppp-mod-pppoe firewall kmod-ipt-offload kmod-tcp-bbr kmod-ipt-nat6 odhcpd-ipv6only odhcp6c DEFAULT_PACKAGES.bootloader:= ifneq ($(DUMP),) diff --git a/package/lean/default-settings/Makefile b/package/lean/default-settings/Makefile index b425d85f19..a7eafbbcbe 100644 --- a/package/lean/default-settings/Makefile +++ b/package/lean/default-settings/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=default-settings PKG_VERSION:=1.0 -PKG_RELEASE:=58 +PKG_RELEASE:=59 PKG_LICENSE:=GPLv3 PKG_LICENSE_FILES:=LICENSE diff --git a/package/lean/default-settings/files/zzz-default-settings b/package/lean/default-settings/files/zzz-default-settings index 744018343a..8ac3dadb77 100755 --- a/package/lean/default-settings/files/zzz-default-settings +++ b/package/lean/default-settings/files/zzz-default-settings @@ -43,9 +43,10 @@ sed -i 's/root::0:0:99999:7:::/root:$1$V4UetPzk$CYXluq4wUazHjmCDBCqXF.:0:0:99999 sed -i "s/# //g" /etc/opkg/distfeeds.conf uci set dhcp.@dnsmasq[0].cachesize='1024' -uci set dhcp.lan.ra='hybrid' -uci set dhcp.lan.dhcpv6='hybrid' -uci set dhcp.lan.ndp='hybrid' +uci set dhcp.lan.ra='server' +uci set dhcp.lan.dhcpv6='server' +uci set dhcp.lan.ra_management='1' +uci set dhcp.lan.ra_default='1' uci commit dhcp sed -i '/REDIRECT --to-ports 53/d' /etc/firewall.user