Author: hrs
Date: Tue Sep 13 00:09:47 2011
New Revision: 225522
URL: http://svn.freebsd.org/changeset/base/225522
Log:
- Add an warning when ifconfig_IF_ipv6 has no inet6 keyword in front
of an IPv6 address. (r225489)
- Use eval for ${ifconfig_args} to fix an issue fixed in r223506. (r225489)
Approved by: re (bz)
Modified:
head/etc/network.subr
Modified: head/etc/network.subr
==============================================================================
--- head/etc/network.subr Tue Sep 13 00:06:11 2011 (r225521)
+++ head/etc/network.subr Tue Sep 13 00:09:47 2011 (r225522)
@@ -126,8 +126,16 @@ ifconfig_up()
# ifconfig_IF_ipv6
ifconfig_args=`ifconfig_getargs $1 ipv6`
if [ -n "${ifconfig_args}" ]; then
+ # backward compatibility: inet6 keyword
+ case "${ifconfig_args}" in
+ :*|[0-9a-fA-F]*:*)
+ warn "\$ifconfig_$1_ipv6 needs " \
+ "\"inet6\" keyword for an IPv6 address."
+ ifconfig_args="inet6 ${ifconfig_args}"
+ ;;
+ esac
ifconfig $1 inet6 -ifdisabled
- ifconfig $1 ${ifconfig_args}
+ eval ifconfig $1 ${ifconfig_args}
_cfg=0
fi
@@ -137,7 +145,7 @@ ifconfig_up()
warn "\$ipv6_ifconfig_$1 is obsolete." \
" Use ifconfig_$1_ipv6 instead."
ifconfig $1 inet6 -ifdisabled
- ifconfig $1 inet6 ${ifconfig_args}
+ eval ifconfig $1 inet6 ${ifconfig_args}
_cfg=0
fi
fi
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
