Attachment 754313 Details for Bug 967529 – proposed changes v2

[patch] proposed changes v2

proposed_changes_v2.patch (text/plain), 5.18 KB, created by David Beveridge on 2013-05-29 11:40:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Beveridge

Created: 2013-05-29 11:40:41 UTC

Size: 5.18 KB

patch

obsolete

>diff -ru initscripts-9.46-orig/ppp/ipv6-down initscripts-9.46-changed/ppp/ipv6-down
>--- initscripts-9.46-orig/ppp/ipv6-down	2013-04-12 21:08:50.000000000 +1000
>+++ initscripts-9.46-changed/ppp/ipv6-down	2013-05-29 21:19:19.134474204 +1000
>@@ -54,6 +54,14 @@
> 	ipv6_trigger_radvd down "$IPV6_RADVD_TRIGGER_ACTION" $IPV6_RADVD_PIDFILE
> fi
> 
>+for prefix_delegation_interface in $DHCP6_PD; do
>+        ipv6_cleanup_device $prefix_delegation_interface
>+done
>+
>+if [[ "${DHCPV6C}"  = [IiYy1]* ]] && [ -x /sbin/dhclient ]; then
>+	killproc -p /var/run/dhclient6-${DEVICE}.pid dhclient
>+fi
>+
> # IPv6 test, no module loaded, exit if system is not IPv6-ready
> ipv6_test testonly || exit 0
> 
>diff -ru initscripts-9.46-orig/ppp/ipv6-up initscripts-9.46-changed/ppp/ipv6-up
>--- initscripts-9.46-orig/ppp/ipv6-up	2013-04-12 21:08:50.000000000 +1000
>+++ initscripts-9.46-changed/ppp/ipv6-up	2013-05-29 21:15:52.327170080 +1000
>@@ -102,6 +102,23 @@
> 	done
> fi
> 
>+# Start wide-dhcpv6 client
>+if [[ "${DHCPV6C}"  = [Ww2]* ]] && [ -x /sbin/dhcp6c ]; then
>+    generate_wide_dhcpv6_client_conf ${REALDEVICE}
>+    /sbin/dhcp6c ${DHCP6CONF} ${REALDEVICE}
>+fi
>+
>+# Start ISC dhcpv6 client
>+if [[ "${DHCPV6C}"  = [IiYy1]* ]] && [ -x /sbin/dhclient ]; then
>+    generate_config_file_name 6
>+    generate_lease_file_name 6
>+    if [ ! -e ${LEASEFILE} ] || ! grep default-duid ${LEASEFILE} > /dev/null ; then
>+	myhwaddr=`ip add | grep link/ether | cut -f 6 -d \  | tail -n 1 | sed s/:/\\\\\\\\x/g`
>+	echo "default-duid \"\\x00\\x03\\x00\\x01\\x$myhwaddr\";" > ${LEASEFILE}
>+    fi
>+    /sbin/dhclient -6 -P ${DHCPV6C_OPTIONS} ${DHCLIENTCONF} -lf ${LEASEFILE} -pf /var/run/dhclient6-${DEVICE}.pid -H ${DHCP_HOSTNAME:-${HOSTNAME%%.*}} ${DEVICE}
>+fi
>+
> if [ "$IPV6_CONTROL_RADVD" = "yes" ]; then						
> 	# Control running radvd								
> 	ipv6_trigger_radvd up "$IPV6_RADVD_TRIGGER_ACTION" $IPV6_RADVD_PIDFILE		
>diff -ru initscripts-9.46-orig/sysconfig/network-scripts/ifup-eth initscripts-9.46-changed/sysconfig/network-scripts/ifup-eth
>--- initscripts-9.46-orig/sysconfig/network-scripts/ifup-eth	2013-04-12 21:08:50.000000000 +1000
>+++ initscripts-9.46-changed/sysconfig/network-scripts/ifup-eth	2013-05-29 21:14:20.395294936 +1000
>@@ -279,7 +279,11 @@
> 
> # IPv6 initialisation?
> /etc/sysconfig/network-scripts/ifup-ipv6 ${CONFIG}
>-if [[ "${DHCPV6C}"  = [Yy1]* ]] && [ -x /sbin/dhclient ]; then
>+if [[ "${DHCPV6C}"  = [Ww2]* ]] && [ -x /sbin/dhcp6c ]; then
>+    generate_wide_dhcpv6_client_conf ${DEVICE}
>+    /sbin/dhcp6c ${DHCP6CONF} ${DEVICE}
>+fi
>+if [[ "${DHCPV6C}"  = [IiYy1]* ]] && [ -x /sbin/dhclient ]; then
>     generate_config_file_name 6
>     generate_lease_file_name 6
>     echo
>diff -ru initscripts-9.46-orig/sysconfig/network-scripts/network-functions-ipv6 initscripts-9.46-changed/sysconfig/network-scripts/network-functions-ipv6
>--- initscripts-9.46-orig/sysconfig/network-scripts/network-functions-ipv6	2013-04-12 21:08:50.000000000 +1000
>+++ initscripts-9.46-changed/sysconfig/network-scripts/network-functions-ipv6	2013-05-29 21:23:46.773584634 +1000
>@@ -1042,3 +1042,56 @@
> 
> 	return 0
> }
>+
>+
>+
>+# function to generate config filename for wide-dhcpv6 client
>+# Add DHCPV6C=wide to interface config to use this
>+# If the interface is a WAN interface and want to delegate
>+# prefixes specify them using DHCP6_PD="eth1 eth2"
>+
>+generate_wide_dhcpv6_client_conf () {
>+        local fn="generate_wide_dhcpv6_client_conf"
>+
>+        local device=$1
>+
>+        if [ -z "$device" ]; then
>+                net_log $"Missing parameter 'device' (arg 1)" err $fn
>+                return 1
>+        fi
>+
>+	# config file that specifically belongs to this device?
>+        if [ -s /etc/wide-dhcpv6/dhcp6c-${DEVICE}.conf ]; then
>+                DHCP6CONF="-c /etc/wide-dhcpv6/dhcp6c-${device}.conf";
>+        else
>+		# default config file?
>+                if [ -s /etc/wide-dhcpv6/dhcp6c.conf ]; then
>+                        DHCP6CONF=""
>+                else
>+			# no pre-existing config files exist, so let's make one.
>+                        DHCP6CONFILE="/etc/wide-dhcpv6/dhcp6c-${device}-auto.conf"
>+                        echo "## DO NOT MODIFY THIS FILE - rename it with the '-auto' removed" > $DHCP6CONFILE
>+                        if [ -z "$DHCP6_PD" ]; then
>+				# no prefix delegation
>+                                echo "interface ${device} { send ia-na 0; };" >> $DHCP6CONFILE
>+                        else
>+                                echo "interface ${device} { send ia-na 0; send ia-pd 0; };" >> $DHCP6CONFILE
>+                                echo "id-assoc pd {" >> $DHCP6CONFILE
>+                                for i in $DHCP6_PD ; do
>+                                        echo "    prefix-interface $i { };" >> $DHCP6CONFILE
>+                                done
>+                                echo "};" >> $DHCP6CONFILE
>+                        fi
>+                        echo "id-assoc na {};" >> $DHCP6CONFILE
>+                        if [ -s $DHCP6CONFILE ]; then
>+                                DHCP6CONF="-c $DHCP6CONFILE"
>+                        else
>+                                DHCP6CONF=""
>+                                net_log $"Unable to write $DHCP6CONFILE" err $fn
>+                                return 1
>+                        fi
>+                fi
>+        fi
>+}
>+
>+

Actions: View | Diff

Attachments on bug 967529: 753581 | 753586 | 753589 | 753590 | 753591 | 754296 | 754312 | 754313 | 754315 | 754317