diff options
author | brooks <brooks@FreeBSD.org> | 2008-03-28 06:50:06 +0000 |
---|---|---|
committer | brooks <brooks@FreeBSD.org> | 2008-03-28 06:50:06 +0000 |
commit | b37acc3c8a0967e0ea1a436c1e7579a3e6d0b164 (patch) | |
tree | 4d8df6b98a3ef8aff9d880bcd75938adb6a6f7dd /etc/network.subr | |
parent | dd866faa707ae5248bcb678122dd6e68dfc09c5b (diff) | |
download | FreeBSD-src-b37acc3c8a0967e0ea1a436c1e7579a3e6d0b164.zip FreeBSD-src-b37acc3c8a0967e0ea1a436c1e7579a3e6d0b164.tar.gz |
Support gif_interface values that don't follow the pattern gif###.
Remove ancient compatablity support for gif_interface="NO".
Diffstat (limited to 'etc/network.subr')
-rw-r--r-- | etc/network.subr | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/etc/network.subr b/etc/network.subr index a98954b..c07b295 100644 --- a/etc/network.subr +++ b/etc/network.subr @@ -472,14 +472,6 @@ ng_create_one() { } gif_up() { - # The following must be removed once RELENG_7 is branched. - case ${gif_interfaces} in - [Nn][Oo]) - warn "gif_interfaces=\"NO\" is deprecated, use gif_interfaces=\"\" instead." - gif_interfaces="" - ;; - esac - for i in ${gif_interfaces}; do peers=`get_if_var $i gifconfig_IF` case ${peers} in @@ -487,7 +479,12 @@ gif_up() { continue ;; *) - ifconfig $i create >/dev/null 2>&1 + if expr $i : 'gif[0-9][0-9]*$' >/dev/null 2>&1; then + ifconfig $i create >/dev/null 2>&1 + else + gif=`ifconfig gif create` + ifconfig $gif name $i + fi ifconfig $i tunnel ${peers} ifconfig $i up ;; |