Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux:[6931] branches/1.0
|
From: <abe...@us...> - 2015-01-13 19:23:50
|
Revision: 6931
http://sourceforge.net/p/astlinux/code/6931
Author: abelbeck
Date: 2015-01-13 19:23:42 +0000 (Tue, 13 Jan 2015)
Log Message:
-----------
retire radvd, use dnsmasq for IPv6 router advertisements
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/astlinux18.config
branches/1.0/package/dnsmasq/dnsmasq.init
branches/1.0/package/radvd/Config.in
branches/1.0/package/radvd/radvd.mk
Removed Paths:
-------------
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K05radvd
branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S92radvd
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2015-01-13 14:07:38 UTC (rev 6930)
+++ branches/1.0/astlinux-ast11.config 2015-01-13 19:23:42 UTC (rev 6931)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6916-dirty Configuration
-# Fri Jan 9 10:34:36 2015
+# Buildroot 2011.08-svn6930-dirty Configuration
+# Tue Jan 13 08:11:58 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -771,7 +771,6 @@
BR2_PACKAGE_PPPD=y
# BR2_PACKAGE_PPPD_FILTER is not set
# BR2_PACKAGE_PPPD_RADIUS is not set
-BR2_PACKAGE_RADVD=y
BR2_PACKAGE_RP_PPPOE=y
# BR2_PACKAGE_PPTP_LINUX is not set
BR2_PACKAGE_PPTPD=y
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2015-01-13 14:07:38 UTC (rev 6930)
+++ branches/1.0/astlinux-ast13.config 2015-01-13 19:23:42 UTC (rev 6931)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6916-dirty Configuration
-# Fri Jan 9 10:34:36 2015
+# Buildroot 2011.08-svn6930-dirty Configuration
+# Tue Jan 13 08:11:59 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -771,7 +771,6 @@
BR2_PACKAGE_PPPD=y
# BR2_PACKAGE_PPPD_FILTER is not set
# BR2_PACKAGE_PPPD_RADIUS is not set
-BR2_PACKAGE_RADVD=y
BR2_PACKAGE_RP_PPPOE=y
# BR2_PACKAGE_PPTP_LINUX is not set
BR2_PACKAGE_PPTPD=y
Modified: branches/1.0/astlinux18.config
===================================================================
--- branches/1.0/astlinux18.config 2015-01-13 14:07:38 UTC (rev 6930)
+++ branches/1.0/astlinux18.config 2015-01-13 19:23:42 UTC (rev 6931)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot 2011.08-svn6916-dirty Configuration
-# Fri Jan 9 10:34:36 2015
+# Buildroot 2011.08-svn6930-dirty Configuration
+# Tue Jan 13 08:11:58 2015
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -771,7 +771,6 @@
BR2_PACKAGE_PPPD=y
# BR2_PACKAGE_PPPD_FILTER is not set
# BR2_PACKAGE_PPPD_RADIUS is not set
-BR2_PACKAGE_RADVD=y
BR2_PACKAGE_RP_PPPOE=y
# BR2_PACKAGE_PPTP_LINUX is not set
BR2_PACKAGE_PPTPD=y
Modified: branches/1.0/package/dnsmasq/dnsmasq.init
===================================================================
--- branches/1.0/package/dnsmasq/dnsmasq.init 2015-01-13 14:07:38 UTC (rev 6930)
+++ branches/1.0/package/dnsmasq/dnsmasq.init 2015-01-13 19:23:42 UTC (rev 6931)
@@ -6,6 +6,27 @@
. /etc/init.d/functions.d/network
. /etc/init.d/functions.d/misc
+addr_to_prefix64()
+{
+ local cnt=1 prefix="" next
+
+ if [ -n "$1" ]; then
+ while [ $cnt -le 4 ]; do
+ next="$(echo "$1" | cut -s -d':' -f$cnt)"
+ if [ -z "$next" ]; then
+ break
+ fi
+ prefix="${prefix}${prefix:+:}${next}"
+ cnt=$((cnt + 1))
+ done
+ if [ -n "$prefix" ]; then
+ prefix="${prefix}::"
+ fi
+ fi
+
+ echo "$prefix"
+}
+
dnscrypt_proxy_check()
{
if [ -f /etc/init.d/dnscrypt ]; then
@@ -78,6 +99,47 @@
no-dhcp-interface=$1"
}
+addIPV6net()
+{
+ # args: IF, tag
+ local interface="$1" tag="$2" prefix="" iname IFS
+
+ unset IFS
+ for iname in $IPV6_AUTOCONF; do
+ case $iname in
+ INTIF)
+ if [ "$tag" = "lan" ]; then
+ prefix="$(addr_to_prefix64 "$INTIPV6")"
+ break
+ fi
+ ;;
+ INT2IF)
+ if [ "$tag" = "lan2" ]; then
+ prefix="$(addr_to_prefix64 "$INT2IPV6")"
+ break
+ fi
+ ;;
+ INT3IF)
+ if [ "$tag" = "lan3" ]; then
+ prefix="$(addr_to_prefix64 "$INT3IPV6")"
+ break
+ fi
+ ;;
+ DMZIF)
+ if [ "$tag" = "dmz" ]; then
+ prefix="$(addr_to_prefix64 "$DMZIPV6")"
+ break
+ fi
+ ;;
+ esac
+ done
+
+ if [ -n "$prefix" ]; then
+ echo "
+dhcp-range=$tag,$prefix,ra-only,64,24h"
+ fi
+}
+
addDNSMASQnet()
{
# args: IF, IP, NM, tag
@@ -98,6 +160,10 @@
ipstart=$(($ipbase + $dstart))
ipend=$(($ipbase + $dend))
trueDNSMASQnet $4 $2 $(_mkdottedquad $ipstart) $(_mkdottedquad $ipend)
+
+ if [ "$IPV6" = "yes" ]; then
+ addIPV6net $1 $4
+ fi
else
falseDNSMASQnet $1
fi
@@ -151,6 +217,11 @@
echo "enable-tftp
tftp-root=/tftpboot"
fi
+
+ # IPv6 Options
+ if [ "$IPV6" = "yes" ]; then
+ echo "quiet-ra"
+ fi
}
addDHCPhosts_options()
@@ -275,7 +346,7 @@
ln -sf /mnt/kd/dnsmasq.conf /tmp/etc/dnsmasq.conf
return
fi
-
+
if is_DHCP_active || is_EXTDHCP_active; then
createDNSMASQbasic dhcp >> /tmp/etc/dnsmasq.conf
Modified: branches/1.0/package/radvd/Config.in
===================================================================
--- branches/1.0/package/radvd/Config.in 2015-01-13 14:07:38 UTC (rev 6930)
+++ branches/1.0/package/radvd/Config.in 2015-01-13 19:23:42 UTC (rev 6931)
@@ -2,6 +2,7 @@
bool "radvd"
select BR2_PACKAGE_FLEX
depends on BR2_INET_IPV6
+ depends on !BR2_PACKAGE_DNSMASQ
help
IPv6 Router Advertisement Daemon.
Modified: branches/1.0/package/radvd/radvd.mk
===================================================================
--- branches/1.0/package/radvd/radvd.mk 2015-01-13 14:07:38 UTC (rev 6930)
+++ branches/1.0/package/radvd/radvd.mk 2015-01-13 19:23:42 UTC (rev 6931)
@@ -13,8 +13,17 @@
define RADVD_INSTALL_INITSCRIPT
$(INSTALL) -D -m 0755 package/radvd/radvd.init $(TARGET_DIR)/etc/init.d/radvd
ln -sf /tmp/etc/radvd.conf $(TARGET_DIR)/etc/radvd.conf
+ ln -sf ../../init.d/radvd $(TARGET_DIR)/etc/runlevels/default/S92radvd
+ ln -sf ../../init.d/radvd $(TARGET_DIR)/etc/runlevels/default/K05radvd
endef
RADVD_POST_INSTALL_TARGET_HOOKS += RADVD_INSTALL_INITSCRIPT
+define RADVD_UNINSTALL_TARGET_CMDS
+ rm -f $(TARGET_DIR)/etc/init.d/radvd
+ rm -f $(TARGET_DIR)/etc/radvd.conf
+ rm -f $(TARGET_DIR)/etc/runlevels/default/S92radvd
+ rm -f $(TARGET_DIR)/etc/runlevels/default/K05radvd
+endef
+
$(eval $(call AUTOTARGETS,package,radvd))
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K05radvd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K05radvd 2015-01-13 14:07:38 UTC (rev 6930)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/K05radvd 2015-01-13 19:23:42 UTC (rev 6931)
@@ -1 +0,0 @@
-link ../../init.d/radvd
\ No newline at end of file
Deleted: branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S92radvd
===================================================================
--- branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S92radvd 2015-01-13 14:07:38 UTC (rev 6930)
+++ branches/1.0/project/astlinux/target_skeleton/etc/runlevels/default/S92radvd 2015-01-13 19:23:42 UTC (rev 6931)
@@ -1 +0,0 @@
-link ../../init.d/radvd
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
