View | Details | Raw Unified | Return to bug 616765
Collapse All | Expand All

(-)a/scripts/ifup-dhcp (-3 / +7 lines)
Lines 199-205 case "$ACTION" in Link Here
199
	;;
199
	;;
200
	*)
200
	*)
201
		HAVE_IPv6=yes
201
		HAVE_IPv6=yes
202
		test -d /proc/sys/net/ipv6 || HAVE_IPv6=no
202
		test -d /proc/sys/net/ipv6 && {
203
			val1=`cat "/proc/sys/net/ipv6/conf/$INTERFACE/disable_ipv6" 2>/dev/null`
204
			val2=`cat "/proc/sys/net/ipv6/conf/all/disable_ipv6" 2>/dev/null`
205
			test "x$val1" = x1 -o "x$val2" = x1 && HAVE_IPv6=no
206
		} || HAVE_IPv6=no
203
207
204
		clients=0
208
		clients=0
205
		bootprotos=(${BOOTPROTOS[@]})
209
		bootprotos=(${BOOTPROTOS[@]})
Lines 256-262 case "$ACTION" in Link Here
256
					if [ "x$explicit_dhcp6" = "xyes" ] ; then
260
					if [ "x$explicit_dhcp6" = "xyes" ] ; then
257
						if [ "x$HAVE_IPv6" = xyes ] ; then
261
						if [ "x$HAVE_IPv6" = xyes ] ; then
258
							print_mesg err_mesg "DHCP6 client is not available."
262
							print_mesg err_mesg "DHCP6 client is not available."
259
							print_mesg err_mesg "      Please install 'dhcpv6' package'"
263
							print_mesg err_mesg "      Please install 'dhcpv6' or 'dhcp-client' package'"
260
						else
264
						else
261
							print_mesg err_mesg "DHCP6 disabled - no IPv6 support"
265
							print_mesg err_mesg "DHCP6 disabled - no IPv6 support"
262
						fi
266
						fi
Lines 265-271 case "$ACTION" in Link Here
265
				*)
269
				*)
266
					DHCLIENT6=""
270
					DHCLIENT6=""
267
					print_mesg err_mesg "DHCP6 client unknown/unsupported: $DHCLIENT6_BIN"
271
					print_mesg err_mesg "DHCP6 client unknown/unsupported: $DHCLIENT6_BIN"
268
					print_mesg err_mesg "      Please install the 'dhcpv6' package"
272
					print_mesg err_mesg "      Please install the 'dhcpv6' or 'dhcp-client' package"
269
				;;
273
				;;
270
				esac
274
				esac
271
			;;
275
			;;

Return to bug 616765