[gentoo-commits] proj/openrc:master commit in: net/

[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     a9f1ac2dfdc3ab7421ea33ae977f7e078750e542
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 11 03:54:32 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Oct 11 03:56:37 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=a9f1ac2d

net/bonding: Sanity-check sysfs usage

If sysfs is not available, you might still be able to create bond
interfaces, but only in very specific configurations, and you must have
the ifenslave binary instead to call ioctls.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 net/bonding.sh |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/net/bonding.sh b/net/bonding.sh
index 67b0d9b..7ea7508 100644
--- a/net/bonding.sh
+++ b/net/bonding.sh
@@ -5,6 +5,11 @@ bonding_depend()
 {
 	before interface macchanger
 	program /sbin/ifconfig /bin/ifconfig
+	# If you do not have sysfs, you MUST have this binary instead for ioctl
+	# Also you will loose some functionality that cannot be done via sysfs:
+	if [ ! -d /sys/class/net ]; then
+		program /sbin/ifenslave
+	fi
 }
 
 _config_vars="$_config_vars slaves"
@@ -38,6 +43,10 @@ bonding_pre_start()
 		fi
 	fi
 
+	if [ ! -d /sys/class/net ]; then
+		ewarn "sysfs is not available! You will be unable to create new bonds, or change dynamic parameters!"
+	fi
+
 	# We can create the interface name we like now, but this
 	# requires sysfs
 	if ! _exists && [ -d /sys/class/net ]; then
@@ -55,7 +64,7 @@ bonding_pre_start()
 
 	# Configure the bond mode, then we can reloop to ensure we configure
 	# All other options
-	for x in /sys/class/net/"${IFACE}"/bonding/mode; do
+	[ -d /sys/class/net ] && for x in /sys/class/net/"${IFACE}"/bonding/mode; do
 		[ -f "${x}" ] || continue
 		n=${x##*/}
 		eval s=\$${n}_${IFVAR}
@@ -66,7 +75,7 @@ bonding_pre_start()
 		fi
 	done
 	# Nice and dynamic for remaining options:)
-	for x in /sys/class/net/"${IFACE}"/bonding/*; do
+	[ -d /sys/class/net ] && for x in /sys/class/net/"${IFACE}"/bonding/*; do
 		[ -f "${x}" ] || continue
 		n=${x##*/}
 		eval s=\$${n}_${IFVAR}
@@ -154,7 +163,7 @@ bonding_pre_start()
 			fi
 		done
 	else
-		/sbin/ifenslave "${IFACE}" ${slaves} >/dev/null
+		ifenslave "${IFACE}" ${slaves} >/dev/null
 	fi
 	eend $?
 
@@ -187,7 +196,7 @@ bonding_stop()
 			echo -"${s}" > /sys/class/net/"${IFACE}"/bonding/slaves
 		done
 	else
-		/sbin/ifenslave -d "${IFACE}" ${slaves}
+		ifenslave -d "${IFACE}" ${slaves}
 	fi
 
 	# reset all slaves

[gentoo-commits] proj/openrc:master commit in: net/

[William Hubbs]

commit:     f36f8fb1be7e68af4d192ed3e67a2da310946ecb
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sun Feb 17 21:37:27 2013 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Feb 17 21:37:27 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=f36f8fb1

Typo Fix

Reported-by: vitalyb <AT> telenet.dn.ua
X-Gentoo-Bug: 452544
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=452544

---
 net/vlan.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/vlan.sh b/net/vlan.sh
index 458cb2d..10040af 100644
--- a/net/vlan.sh
+++ b/net/vlan.sh
@@ -71,7 +71,7 @@ vlan_post_start()
 		[ -z "${vname}" ] && vname="${IFACE}.${vlan}"
 		# 2) flags
 		eval vflags=\$${IFACE}_vlan${vlan}_flags
-		[ -z "${vname}" ] && eval vflags=\$vlan${vlan}_flags
+		[ -z "${vflags}" ] && eval vflags=\$vlan${vlan}_flags
 		# 3) ingress/egress map
 		eval vingress=\$${IFACE}_vlan${vlan}_ingress
 		[ -z "${vingress}" ] && eval vingress=\$vlan${vlan}_ingress

[gentoo-commits] proj/openrc:master commit in: net/

[William Hubbs]

commit:     a8ab9d63f5ea41a1e5821e22ae95f9fa92b96e4d
Author:     Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Fri Dec 21 22:36:20 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Dec 21 22:36:20 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=a8ab9d63

ifconfig.sh.Linux.in: fix ipv6 routes and default route

Do not add -net or -host to ipv6 routes or to the default route when
using route from net-tools.

X-Gentoo-Bug: 442594
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=442594

---
 net/ifconfig.sh.Linux.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/ifconfig.sh.Linux.in b/net/ifconfig.sh.Linux.in
index 19e5c35..2afa66c 100644
--- a/net/ifconfig.sh.Linux.in
+++ b/net/ifconfig.sh.Linux.in
@@ -209,7 +209,7 @@ _add_route()
 	fi
 
 	case "$@" in
-		*:*) [ "$1" = "-net" ] && shift;;
+		*:*|default*) [ "$1" = "-net" -o "$1" = "-host" ] && shift;;
 	esac
 
 	route ${family} add "$@" dev "${IFACE}"

[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     e0bbe8d0bde82b14aa9a867707298c2040442151
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 20 21:28:23 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Dec 20 21:28:23 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=e0bbe8d0

net/bonding: ensure mode & miimon are handled correctly.

miimon & mode must be set before other parameters, and then not changed
again. Prior commit f671e0a28 per bug #421757 introduced a small logic
error. Fixed & refactored to prevent it happening as easily.

X-Gentoo-Bug: 447790
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=447790
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 net/bonding.sh |   24 ++++++++----------------
 1 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/net/bonding.sh b/net/bonding.sh
index c3e532a..fb00825 100644
--- a/net/bonding.sh
+++ b/net/bonding.sh
@@ -62,22 +62,13 @@ bonding_pre_start()
 	# Interface must be down in order to configure
 	_down
 
-	# Configure the bond mode, then we can reloop to ensure we configure
-	# All other options
-	[ -d /sys/class/net ] && for x in /sys/class/net/"${IFACE}"/bonding/mode; do
+	# Configure the bond mode & link monitoring, then we can reloop to ensure
+	# we configure all other options
+	# mode needs to be done before all other options.
+	# miimon needs to be done BEFORE downdelay
+	[ -d /sys/class/net ] && for n in mode miimon; do
+		x=/sys/class/net/"${IFACE}"/bonding/$n
 		[ -f "${x}" ] || continue
-		n=${x##*/}
-		eval s=\$${n}_${IFVAR}
-		if [ -n "${s}" ]; then
-			einfo "Setting ${n}: ${s}"
-			echo "${s}" >"${x}" || \
-			eerror "Failed to configure $n (${n}_${IFVAR})"
-		fi
-	done
-	# Configure link monitoring
-	for x in /sys/class/net/"${IFACE}"/bonding/miimon; do
-		[ -f "${x}" ] || continue
-		n=${x##*/}
 		eval s=\$${n}_${IFVAR}
 		if [ -n "${s}" ]; then
 			einfo "Setting ${n}: ${s}"
@@ -90,7 +81,8 @@ bonding_pre_start()
 		[ -f "${x}" ] || continue
 		n=${x##*/}
 		eval s=\$${n}_${IFVAR}
-		[ "${n}" != "mode" -o "${n}" != "miimon" ] || continue
+		# skip mode and miimon
+		[ "${n}" == "mode" -o "${n}" == "miimon" ] && continue
 		if [ -n "${s}" ]; then
 			einfo "Setting ${n}: ${s}"
 			echo "${s}" >"${x}" || \

[gentoo-commits] proj/openrc:master commit in: net/

[William Hubbs]

commit:     cf7b9047040264c02decf90e5d1355508fa98ded
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sat Nov 10 20:56:17 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Nov 10 20:56:33 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=cf7b9047

firewalld: fix firewall-cmd dependency

This should be "program" instead of "program start".

---
 net/firewalld.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/firewalld.sh b/net/firewalld.sh
index b002967..ae83c57 100644
--- a/net/firewalld.sh
+++ b/net/firewalld.sh
@@ -5,7 +5,7 @@ firewalld_depend()
 {
 	after interface
 	before dhcp
-	program start firewall-cmd
+	program firewall-cmd
 	[ "$IFACE" != "lo" ] && need firewalld
 }
 

[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     3809eac54d575d52d8793df38f826f1d7d7398fb
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  7 00:13:58 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Nov  7 00:13:58 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=3809eac5

net/iwconfig: Even more bashism fun.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 net/ip6rd.sh |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/net/ip6rd.sh b/net/ip6rd.sh
index 03b5897..a35e2b7 100644
--- a/net/ip6rd.sh
+++ b/net/ip6rd.sh
@@ -117,27 +117,34 @@ _ip6rd_inet_atoi()
 {
 	local IFS="${IFS}." ipi=0 j=3
 	for i in $1 ; do
-	       ipi=$(( ipi | i << 8*j-- ))
+		# post-decrement isn't valid
+		ipi=$(( ipi | (i << (8*j))  ))
+		j=$(( j - 1 ))
 	done
 	echo ${ipi}
 }
 
 _ip6rd_inet_itoa()
 {
-	local ipi=$1
+	local ipi=$1 bitmask v
+	bitmask=$(( (1 << 24)-1 ))
 	for i in 0 1 2 3; do
+		v=$(( (ipi & ~bitmask) >> 24 ))
+		ipi=$(( (ipi & bitmask) << 8 ))
 		if [ $i != 3 ] ; then
-			printf "%d." $(( (ipi & ~((1<<24)-1)) >> 24 ))
-			ipi=$(( (ipi & ((1<<24)-1)) << 8))
+			printf "%d." $v
 		else
-			printf "%d\n" $(( (ipi & ~((1<<24)-1)) >> 24 ))
+			printf "%d\n" $v
 		fi
 	done
 }
 
 _ip6rd_inet_get_network()
 {
-	echo $(_ip6rd_inet_itoa $(( ($(_ip6rd_inet_atoi $1) & ((1<<$2)-1) << (32-$2) ) )) )
+	local a=$(_ip6rd_inet_atoi $1)
+	local net=$(( a & ( (1<<$2)-1 ) ))
+	local cidr=$(( 32 - $2 ))
+	echo $(_ip6rd_inet_itoa $(( (net << cidr ) )) )
 }
 
 _ip6rd_inet_is_private_network()

[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     ca6019031af96eabb471080e91374b44f176d113
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  7 01:44:17 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Nov  7 01:44:26 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=ca601903

net/apipa: checkbashisms false positive.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 net/apipa.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/apipa.sh b/net/apipa.sh
index ae61233..a4aee8a 100644
--- a/net/apipa.sh
+++ b/net/apipa.sh
@@ -8,7 +8,7 @@ apipa_depend()
 
 _random()
 {
-	local r=${RANDOM}
+	local r=${RANDOM} # checkbashisms: false positive, we handle it AFTERWARDS
 	if [ -n "${r}" ]; then
 		echo "${r}"
 	else

[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     dabd8b22ca2313e217cc26a4d30b72b777d771ac
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  6 23:21:38 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Nov  6 23:21:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=dabd8b22

checkbashisms: export syntax.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 net/ifwatchd.sh |    2 +-
 net/macvlan.sh  |    2 +-
 net/tuntap.sh   |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/ifwatchd.sh b/net/ifwatchd.sh
index f9116b9..a39e1c1 100644
--- a/net/ifwatchd.sh
+++ b/net/ifwatchd.sh
@@ -31,7 +31,7 @@ ifwatchd_pre_start()
 	mark_service_inactive
 
 	# Start ifwatchd
-	export IN_BACKGROUND=yes
+	IN_BACKGROUND=yes ; export IN_BACKGROUND
 	start-stop-daemon --start --exec /usr/sbin/ifwatchd \
 		-- -c "${RC_LIBEXECDIR}/sh/ifwatchd-carrier.sh" \
 		-n "${RC_LIBEXECDIR}/sh/ifwatchd-nocarrier.sh" "${IFACE}"

diff --git a/net/macvlan.sh b/net/macvlan.sh
index 86a659c..1b95f5c 100644
--- a/net/macvlan.sh
+++ b/net/macvlan.sh
@@ -12,7 +12,7 @@ macvlan_depend()
 
 _is_macvlan()
 {
-	[ -n "$(export RC_SVCNAME="net.${IFACE}"; service_get_value macvlan)" ]
+	[ -n "$(RC_SVCNAME="net.${IFACE}"; export RC_SVCNAME ; service_get_value macvlan)" ]
 }
 
 macvlan_pre_start()

diff --git a/net/tuntap.sh b/net/tuntap.sh
index d0f24c5..331fd83 100644
--- a/net/tuntap.sh
+++ b/net/tuntap.sh
@@ -11,7 +11,7 @@ _config_vars="$_config_vars iproute2 openvpn tunctl"
 
 _is_tuntap()
 {
-	[ -n "$(export RC_SVCNAME="net.${IFACE}"; service_get_value tuntap)" ]
+	[ -n "$(RC_SVCNAME="net.${IFACE}"; export RC_SVCNAME ; service_get_value tuntap)" ]
 }
 
 tuntap_pre_start()

[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     54562d3525ae99a7982b4e506978dc0b875c240c
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  6 23:18:32 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Nov  6 23:18:32 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=54562d35

net/vlan: checkbashisms.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 net/vlan.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/vlan.sh b/net/vlan.sh
index b29af80..458cb2d 100644
--- a/net/vlan.sh
+++ b/net/vlan.sh
@@ -117,7 +117,7 @@ vlan_post_start()
 			/proc/net/vlan/config )"
 		mark_service_started "net.${ifname}"
 		(
-			export RC_SVCNAME="net.${ifname}"
+			RC_SVCNAME="net.${ifname}" ; export RC_SVCNAME
 			start
 		) || mark_service_stopped "net.${ifname}"
 	done
@@ -134,7 +134,7 @@ vlan_pre_stop()
 	for vlan in $(_get_vlans); do
 		einfo "Removing VLAN ${vlan##*.} from ${IFACE}"
 		(
-			export RC_SVCNAME="net.${vlan}"
+			RC_SVCNAME="net.${vlan}" ; export RC_SVCNAME
 			stop
 		) && {
 			mark_service_stopped "net.${vlan}"

[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     ed3b0c66f9e90b8fafb7996b7700fd34db7ddc11
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  6 23:18:08 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Nov  6 23:18:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=ed3b0c66

net/bonding: checkbashisms.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 net/bonding.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/bonding.sh b/net/bonding.sh
index 044ce21..c3e532a 100644
--- a/net/bonding.sh
+++ b/net/bonding.sh
@@ -136,7 +136,7 @@ bonding_pre_start()
 	else
 		# warn if root on nfs and no subsume interface supplied
 		local root_fs_type=$(mountinfo -s /)
-		if [ "${root_fs_type}" == "nfs" ]; then
+		if [ "${root_fs_type}" = "nfs" ]; then
 			warn_nfs=1
 			ewarn "NFS root detected!!!"
 			ewarn " If your system crashes here, /etc/conf.d/net needs"

[gentoo-commits] proj/openrc:master commit in: net/

[William Hubbs]

commit:     f671e0a28fe566566b5465afbda985542f77ed8a
Author:     Lorand Kelemen <lorand.kelemen <AT> indgroup <DOT> eu>
AuthorDate: Wed Oct 17 17:53:17 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Oct 17 17:53:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=f671e0a2

Oldnet: bonding: set miimon correctly

Miimon needs to be activated before downdelay is set.

X-Gentoo-Bug: 421757
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=421757

---
 net/bonding.sh |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/net/bonding.sh b/net/bonding.sh
index 7ea7508..044ce21 100644
--- a/net/bonding.sh
+++ b/net/bonding.sh
@@ -74,12 +74,23 @@ bonding_pre_start()
 			eerror "Failed to configure $n (${n}_${IFVAR})"
 		fi
 	done
+	# Configure link monitoring
+	for x in /sys/class/net/"${IFACE}"/bonding/miimon; do
+		[ -f "${x}" ] || continue
+		n=${x##*/}
+		eval s=\$${n}_${IFVAR}
+		if [ -n "${s}" ]; then
+			einfo "Setting ${n}: ${s}"
+			echo "${s}" >"${x}" || \
+			eerror "Failed to configure $n (${n}_${IFVAR})"
+		fi
+	done
 	# Nice and dynamic for remaining options:)
 	[ -d /sys/class/net ] && for x in /sys/class/net/"${IFACE}"/bonding/*; do
 		[ -f "${x}" ] || continue
 		n=${x##*/}
 		eval s=\$${n}_${IFVAR}
-		[ "${n}" != "mode" ] || continue
+		[ "${n}" != "mode" -o "${n}" != "miimon" ] || continue
 		if [ -n "${s}" ]; then
 			einfo "Setting ${n}: ${s}"
 			echo "${s}" >"${x}" || \

[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     27984c0d2d920db177ec43de10991c50e143915a
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 11 03:49:45 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Oct 11 03:49:45 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=27984c0d

net/bonding: subsume functionality for NFS booting

If the kernel is NFS-booting, it is critical that we don't down the
slave interfaces when we activate the bond. To do so will break the root
filesystem when networking is temporarily lost.

Reported-by: Walter <walter <AT> pratyeka.org>
X-Gentoo-Bug: 428604
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=428604
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 net/bonding.sh |   52 +++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/net/bonding.sh b/net/bonding.sh
index 7097a4d..67b0d9b 100644
--- a/net/bonding.sh
+++ b/net/bonding.sh
@@ -4,6 +4,7 @@
 bonding_depend()
 {
 	before interface macchanger
+	program /sbin/ifconfig /bin/ifconfig
 }
 
 _config_vars="$_config_vars slaves"
@@ -23,6 +24,9 @@ bonding_pre_start()
 	eval primary="\$primary_${IFVAR}"
 	unset primary_${IFVAR}
 
+	eval subsume="\$subsume_${IFVAR}"
+	unset subsume_${IFVAR}
+
 
 	[ -z "${slaves}" ] && return 0
 
@@ -84,15 +88,44 @@ bonding_pre_start()
 		_exists true || return 1
 	done
 
-	# Must force the slaves to a particular state before adding them
-	for IFACE in ${slaves}; do
-		_delete_addresses
-		_down
-	done
+	# Unless we are subsuming an existing interface (NFS root), we down
+	# slave interfaces to work around bugs supposedly in some chipsets
+	# that cause failure to enslave from other states.
+	if [ -z "${subsume}" ]; then
+		for IFACE in ${slaves}; do
+			_delete_addresses
+			_down
+		done
+	fi
 	)
 
-	# now force the master to up
-	_up
+	# Now force the master to up
+	#  - First test for interface subsume request (required for NFS root)
+	if [ -n "${subsume}" ]; then
+		einfo "Subsuming ${subsume} interface characteristics."
+		eindent
+		local oiface=${IFACE}
+		IFACE=${subsume}
+		local addr="$(_get_inet_address)"
+		einfo "address: ${addr}"
+		IFACE=${oiface}
+		unset oiface
+		eoutdent
+		# subsume (presumably kernel auto-)configured IP
+		ifconfig ${IFACE} ${addr} up
+	else
+		# warn if root on nfs and no subsume interface supplied
+		local root_fs_type=$(mountinfo -s /)
+		if [ "${root_fs_type}" == "nfs" ]; then
+			warn_nfs=1
+			ewarn "NFS root detected!!!"
+			ewarn " If your system crashes here, /etc/conf.d/net needs"
+			ewarn " subsume_${IFACE}=\"<iface>\" ... where <iface> is the"
+			ewarn " existing, (usually kernel auto-)configured interface."
+		fi
+		# up the interface
+		_up
+    fi
 
 	# finally add in slaves
 	# things needed in the process, and if they are done by ifenslave, openrc, and/or the kernel.
@@ -132,6 +165,11 @@ bonding_stop()
 {
 	_is_bond || return 0
 
+	# Wipe subsumed interface
+	if [ -n "${subsume}" ]; then
+		ifconfig ${subsume} 0.0.0.0
+	fi
+
 	local slaves= s=
 	slaves=$( \
 		sed -n -e 's/^Slave Interface: //p' "/proc/net/bonding/${IFACE}" \

[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     9a9c2acd8d0a44799c1c0199bf7e14640f6a86f3
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 10 00:07:26 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Oct 10 00:10:52 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=9a9c2acd

net/{bridge,iproute2}: Stricter iproute2 ip link syntax & promisc handling

The 'dev' argument is only optional for ethX devices, for others it is
mandatory, so we should always include it.

Also tweak when promisc mode is applied to bridges.

Patches submitted by Denis Kaganovich <mahatma <AT> bspu.unibel.by>.

X-Gentoo-Bug: #431204
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=431204
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 net/bridge.sh   |    3 +--
 net/iproute2.sh |   12 ++++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/net/bridge.sh b/net/bridge.sh
index 4f3618a..60d3eeb 100644
--- a/net/bridge.sh
+++ b/net/bridge.sh
@@ -119,10 +119,8 @@ bridge_pre_start()
 				return 1
 			fi
 			# The interface is known to exist now
-			_set_flag promisc
 			_up
 			if ! brctl addif "${BR_IFACE}" "${x}"; then
-				_set_flag -promisc
 				eend 1
 				return 1
 			fi
@@ -144,6 +142,7 @@ bridge_pre_start()
 	) || return 1
 
 	# Bring up the bridge
+	_set_flag promisc
 	_up
 }
 

diff --git a/net/iproute2.sh b/net/iproute2.sh
index eb311c8..3bab7b7 100644
--- a/net/iproute2.sh
+++ b/net/iproute2.sh
@@ -10,12 +10,12 @@ iproute2_depend()
 
 _up()
 {
-	ip link set "${IFACE}" up
+	ip link set dev "${IFACE}" up
 }
 
 _down()
 {
-	ip link set "${IFACE}" down
+	ip link set dev "${IFACE}" down
 }
 
 _exists()
@@ -57,7 +57,7 @@ _set_flag()
 		flag=${flag#-}
 		opt="off"
 	fi
-	ip link set "${IFACE}" "${flag}" "${opt}"
+	ip link set dev "${IFACE}" "${flag}" "${opt}"
 }
 
 _get_mac_address()
@@ -79,7 +79,7 @@ _get_mac_address()
 
 _set_mac_address()
 {
-	ip link set "${IFACE}" address "$1"
+	ip link set dev "${IFACE}" address "$1"
 }
 
 _get_inet_addresses()
@@ -274,12 +274,12 @@ iproute2_pre_start()
 	# MTU support
 	local mtu=
 	eval mtu=\$mtu_${IFVAR}
-	[ -n "${mtu}" ] && ip link set "${IFACE}" mtu "${mtu}"
+	[ -n "${mtu}" ] && ip link set dev "${IFACE}" mtu "${mtu}"
 
 	# TX Queue Length support
 	local len=
 	eval len=\$txqueuelen_${IFVAR}
-	[ -n "${len}" ] && ip link set "${IFACE}" txqueuelen "${len}"
+	[ -n "${len}" ] && ip link set dev "${IFACE}" txqueuelen "${len}"
 
 	return 0
 }

[gentoo-commits] proj/openrc:master commit in: net/

[William Hubbs]

commit:     444bdfbfc4d1a336233ccc5a29495cc1f523b5a3
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Sep  7 19:29:56 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Sep  7 19:29:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=444bdfbf

oldnet/iproute2.sh: fix carrier detection

We were not testing for carrier correctly when testing for ipv6
tentative addresses.

Reported-by: <ast <AT> domdv.de>
X-Gentoo-Bug: 433012
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=433012

---
 net/iproute2.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/iproute2.sh b/net/iproute2.sh
index 16186e8..eb311c8 100644
--- a/net/iproute2.sh
+++ b/net/iproute2.sh
@@ -212,7 +212,7 @@ _delete_addresses()
 
 _has_carrier()
 {
-	return 0
+	LC_ALL=C ip link show dev "${IFACE}" | grep -q "LOWER_UP"
 }
 
 _tunnel()
@@ -287,7 +287,7 @@ iproute2_pre_start()
 _iproute2_ipv6_tentative()
 {
 	# Only check tentative when we have a carrier.
-	LC_ALL=C ip link show dev "${IFACE}" | grep -q "NO-CARRIER" && return 1
+	_has_carrier || return 1
 	LC_ALL=C ip addr show dev "${IFACE}" | \
 		grep -q "^[[:space:]]*inet6 .* tentative"
 }

[gentoo-commits] proj/openrc:master commit in: net/

[William Hubbs]

commit:     dceeef9fe568bd633ed72ca995a1846a9dc20689
Author:     Björn Baumbach <bb <AT> sernet <DOT> de>
AuthorDate: Wed Jul  4 09:47:00 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Jul  4 14:15:54 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=dceeef9f

net: fix typo

---
 net/udhcpc.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/udhcpc.sh b/net/udhcpc.sh
index d001867..130f873 100644
--- a/net/udhcpc.sh
+++ b/net/udhcpc.sh
@@ -61,7 +61,7 @@ udhcpc_start()
 	esac
 
 	case " ${args} " in
-		*" --hosname="*|*" -h "*|*" -H "*);;
+		*" --hostname="*|*" -h "*|*" -H "*);;
 		*)
 			if ${sendhost}; then
 				local hname="$(hostname)"

[gentoo-commits] proj/openrc:master commit in: net/

[William Hubbs]

commit:     ae7cbd910a8d95fcf47ea99e19976e3398f6d947
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  7 05:12:20 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jun  7 05:12:20 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=ae7cbd91

net/udhcpc: use -x hostname:NAME option instead of -h name

reported-by: bug <AT> mejor.pl
X-Gentoo-Bug: 417617
X-Gentoo-Bug-URL: https://bugs.gentoo.org/417617

---
 net/udhcpc.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/udhcpc.sh b/net/udhcpc.sh
index 4eb0b51..d001867 100644
--- a/net/udhcpc.sh
+++ b/net/udhcpc.sh
@@ -66,7 +66,7 @@ udhcpc_start()
 			if ${sendhost}; then
 				local hname="$(hostname)"
 				if [ "${hname}" != "(none)" ] && [ "${hname}" != "localhost" ]; then
-					args="${args} --hostname='${hname}'"
+					args="${args} -x hostname:'${hname}'"
 				fi
 			fi
 			;;

[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     b5917a817c697fa284462319357f5fac45c462f0
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu May  3 20:33:31 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu May  3 20:34:10 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=b5917a81

net: Be sure to install the ip6rd module.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 net/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/Makefile b/net/Makefile
index c2f3747..660b1fa 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -13,7 +13,7 @@ SRCS-Linux=	iwconfig.sh.in
 INC-Linux=	adsl.sh apipa.sh arping.sh bonding.sh br2684ctl.sh bridge.sh \
 		ccwgroup.sh clip.sh ethtool.sh iproute2.sh ifplugd.sh ip6to4.sh \
 		ipppd.sh iwconfig.sh netplugd.sh pppd.sh pump.sh tuntap.sh udhcpc.sh \
-		vlan.sh macvlan.sh
+		vlan.sh macvlan.sh ip6rd.sh
 
 SRCS-NetBSD=
 INC-NetBSD=	ifwatchd.sh

[gentoo-commits] proj/openrc:master commit in: net/

[Christian Ruppert]

commit:     a6549a2b0ffc087bbf7b0ea41cf8dd5bda64e680
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 24 01:50:10 2012 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Tue Apr 24 01:50:10 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=a6549a2b

Whitespace

---
 net/ifconfig.sh.Linux.in |    2 +-
 net/iproute2.sh          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/ifconfig.sh.Linux.in b/net/ifconfig.sh.Linux.in
index 8abc998..19e5c35 100644
--- a/net/ifconfig.sh.Linux.in
+++ b/net/ifconfig.sh.Linux.in
@@ -32,7 +32,7 @@ _ifindex()
 		for f in /sys/class/net/*/ifindex ; do
 			v=$(cat $f)
 			[ $v -gt $index ] && index=$v
-		done 
+		done
 		: $(( index += 1 ))
 	fi
 	echo "${index}"

diff --git a/net/iproute2.sh b/net/iproute2.sh
index b420e41..16186e8 100644
--- a/net/iproute2.sh
+++ b/net/iproute2.sh
@@ -33,7 +33,7 @@ _ifindex()
 		for f in /sys/class/net/*/ifindex ; do
 			v=$(cat $f)
 			[ $v -gt $index ] && index=$v
-		done 
+		done
 		: $(( index += 1 ))
 	fi
 	echo "${index}"

[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     37af1693b48c314224ecd207c2afa6291208412b
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  3 21:30:01 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Apr  3 21:32:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=37af1693

net/ifconfig, net/iproute: need sysfs

sysfs needs to be available before we can check interfaces. On udev
systems this was not a problem, but with mdev/static-dev, there is no
other need for sysfs until later in the init.

X-Gentoo-Bug: 410701
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=410701
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 net/ifconfig.sh.Linux.in |    3 +++
 net/iproute2.sh          |    3 +++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/net/ifconfig.sh.Linux.in b/net/ifconfig.sh.Linux.in
index 8abc998..a7e3e74 100644
--- a/net/ifconfig.sh.Linux.in
+++ b/net/ifconfig.sh.Linux.in
@@ -5,6 +5,9 @@ ifconfig_depend()
 {
 	program /sbin/ifconfig /bin/ifconfig
 	provide interface
+	case "${IFACE}" in
+		lo|lo0) need sysfs ;;
+	esac
 }
 
 _up()

diff --git a/net/iproute2.sh b/net/iproute2.sh
index b420e41..c290331 100644
--- a/net/iproute2.sh
+++ b/net/iproute2.sh
@@ -6,6 +6,9 @@ iproute2_depend()
 	program ip
 	provide interface
 	after ifconfig
+	case "${IFACE}" in
+		lo|lo0) need sysfs ;;
+	esac
 }
 
 _up()

[gentoo-commits] proj/openrc:master commit in: net/

[William Hubbs]

commit:     9127684553ea7b0f9285bc3fbe6c554f4519016c
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  2 03:59:00 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Apr  2 03:59:00 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=91276845

Change the method for calculating the interface metric for linux systems

On linux systems running  >=linux-3.2, the /proc/net/dev file cannot be
relied on to show the order network interfaces were added to the system.
Also, there is currently a bug in the implementation of the seek call
for this file which can cause a system to go into an infinite loop.
This commit changes the _ifindex function to retreive the value of
/sys/class/net/${IFACE}/ifindex and use that value instead of attempting
to calculate one from the interface's position in /proc/net/dev.

reported-by: John Keeping <john.keeping <AT> lineone.net>
X-Gentoo-Bug: 410127
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=410127

---
 net/ifconfig.sh.Linux.in |   26 +++++++++++++-------------
 net/iproute2.sh          |   26 +++++++++++++-------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/net/ifconfig.sh.Linux.in b/net/ifconfig.sh.Linux.in
index 411401d..8abc998 100644
--- a/net/ifconfig.sh.Linux.in
+++ b/net/ifconfig.sh.Linux.in
@@ -24,19 +24,19 @@ _exists()
 
 _ifindex()
 {
-	local line= i=-2
-	while read line; do
-		: $(( i += 1 ))
-		[ ${i} -lt 1 ] && continue
-		case "${line}" in
-			"${IFACE}:"*) echo "${i}"; return 0;;
-		esac
-	done < /proc/net/dev
-
-	# Return the next available index
-	: $(( i += 1 ))
-	echo "${i}"
-	return 1
+	local index=-1
+	local f v
+	if [ -e /sys/class/net/"${IFACE}"/ifindex ]; then
+		index=$(cat /sys/class/net/"${IFACE}"/ifindex)
+	else
+		for f in /sys/class/net/*/ifindex ; do
+			v=$(cat $f)
+			[ $v -gt $index ] && index=$v
+		done 
+		: $(( index += 1 ))
+	fi
+	echo "${index}"
+	return 0
 }
 
 _is_wireless()

diff --git a/net/iproute2.sh b/net/iproute2.sh
index e06152f..b420e41 100644
--- a/net/iproute2.sh
+++ b/net/iproute2.sh
@@ -25,19 +25,19 @@ _exists()
 
 _ifindex()
 {
-	local line= i=-2
-	while read line; do
-		: $(( i += 1 ))
-		[ ${i} -lt 1 ] && continue
-		case "${line}" in
-			"${IFACE}:"*) echo "${i}"; return 0;;
-		esac
-	done < /proc/net/dev
-
-	# Return the next available index
-	: $(( i += 1 ))
-	echo "${i}"
-	return 1
+	local index=-1
+	local f v
+	if [ -e /sys/class/net/"${IFACE}"/ifindex ]; then
+		index=$(cat /sys/class/net/"${IFACE}"/ifindex)
+	else
+		for f in /sys/class/net/*/ifindex ; do
+			v=$(cat $f)
+			[ $v -gt $index ] && index=$v
+		done 
+		: $(( index += 1 ))
+	fi
+	echo "${index}"
+	return 0
 }
 
 _is_wireless()

[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     b27a9003bb0e3123b91b2b734629f980b8ccad6f
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 11 19:54:48 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Mar 11 19:54:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=b27a9003

net/ifconfig: The location of the ifconfig binary has changed

The location of the ifconfig binary has changed in
net-tools-1.60_p20120127084908, and if we do not check both locations
for it, the user will get errors like:
_is_wireless: command not found
_exists: command not found

X-Gentoo-Bug: 407757
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=407757

---
 net/ifconfig.sh.Linux.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/ifconfig.sh.Linux.in b/net/ifconfig.sh.Linux.in
index 9eaa7c5..411401d 100644
--- a/net/ifconfig.sh.Linux.in
+++ b/net/ifconfig.sh.Linux.in
@@ -3,7 +3,7 @@
 
 ifconfig_depend()
 {
-	program /sbin/ifconfig
+	program /sbin/ifconfig /bin/ifconfig
 	provide interface
 }
 

[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     7a1e4ef606a814b124fc35136c2821484981e6cb
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  2 19:54:48 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Mar  2 19:54:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=7a1e4ef6

Bug #405491: _exists can give a false negative since /proc/net/dev can be slow to update sometimes when interfaces are added rapidly. Use sysfs instead.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 net/ifconfig.sh.Linux.in |    2 +-
 net/iproute2.sh          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/ifconfig.sh.Linux.in b/net/ifconfig.sh.Linux.in
index 80a0b98..9eaa7c5 100644
--- a/net/ifconfig.sh.Linux.in
+++ b/net/ifconfig.sh.Linux.in
@@ -19,7 +19,7 @@ _down()
 
 _exists()
 {
-	grep -Eq "^[[:space:]]*${IFACE}:" /proc/net/dev
+	[ -e /sys/class/net/"$IFACE" ]
 }
 
 _ifindex()

diff --git a/net/iproute2.sh b/net/iproute2.sh
index 09912bf..e06152f 100644
--- a/net/iproute2.sh
+++ b/net/iproute2.sh
@@ -20,7 +20,7 @@ _down()
 
 _exists()
 {
-	grep -Eq "^[[:space:]]*${IFACE}:" /proc/net/dev
+	[ -e /sys/class/net/"$IFACE" ]
 }
 
 _ifindex()

[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     29a1ad3d18e8539077ef9a9636ac2841553cb934
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  9 09:43:27 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Feb  9 09:43:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=29a1ad3d

Whitespace.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 net/ip6rd.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/ip6rd.sh b/net/ip6rd.sh
index 9da0576..03b5897 100644
--- a/net/ip6rd.sh
+++ b/net/ip6rd.sh
@@ -46,7 +46,7 @@ ip6rd_pre_start()
 		eerror "${host} is not configured with an IPv4 address"
 		return 1
 	fi
-	# TODO: Get this settings from DHCP (Option 212) 
+	# TODO: Get this settings from DHCP (Option 212)
 	if [ -z "${prefix}" ]; then
 		eerror "prefix_${IFVAR} not set"
 		return 1
@@ -164,5 +164,5 @@ _ip6rd_prefix_shave_bits()
 	then
 		printf "%0$(( (32-$2>>2)+(($2%4)?1:0) ))x" \
 		$((ipi >> 16))
-	fi	
+	fi
 }

[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     659f7c2bc82c43088fd4a479d8fee849fe89141e
Author:     Salah Coronya <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Thu Feb  9 09:39:40 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Feb  9 09:39:40 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=659f7c2b

oldnet: ip6rd support

X-Gentoo-Bug: 392223
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=392223
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 net/ip6rd.sh |  168 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 168 insertions(+), 0 deletions(-)

diff --git a/net/ip6rd.sh b/net/ip6rd.sh
new file mode 100644
index 0000000..9da0576
--- /dev/null
+++ b/net/ip6rd.sh
@@ -0,0 +1,168 @@
+# Copyright (c) 2011 by Gentoo Foundation
+# Released under the 2-clause BSD license.
+
+_config_vars="$_config_vars link prefix suffix ipv4mask relay"
+
+ip6rd_depend()
+{
+	program ip
+	after interface
+}
+
+ip6rd_pre_start()
+{
+	# ALL interfaces run pre_start blocks, not just those with something
+	# assigned, so we must check if we need to run on this interface before we
+	# do so.
+	local config
+	eval config=\$config_${IFVAR}
+	[ "$config" = "ip6rd" ] || return 0
+
+	case "${MODULES}" in
+		*" ifconfig "*)
+			eerror "ifconfig is not supported for 6rd"
+			eerror "Please emerge sys-apps/iproute2"
+			return 1
+			;;
+	esac
+
+	local host= suffix= relay= addr= iface=${IFACE} config_ip6rd= localip= ipv4mask=
+	eval host=\$link_${IFVAR}
+	if [ -z "${host}" ]; then
+		eerror "link_${IFVAR} not set"
+		return 1
+	fi
+
+	eval host=\${link_${IFVAR}}
+	eval ipv4mask=\${ipv4mask_${IFVAR}:-0}
+	eval suffix=\${suffix_${IFVAR}:-1}
+	eval relay=\${relay_${IFVAR}}
+	eval prefix=\${prefix_${IFVAR}}
+
+	IFACE=${host}
+	addrs=$(_get_inet_addresses)
+	IFACE=${iface}
+	if [ -z "${addrs}" ]; then
+		eerror "${host} is not configured with an IPv4 address"
+		return 1
+	fi
+	# TODO: Get this settings from DHCP (Option 212) 
+	if [ -z "${prefix}" ]; then
+		eerror "prefix_${IFVAR} not set"
+		return 1
+	fi
+	if [ -z "${relay}" ]; then
+		eerror "relay_${IFVAR} not set"
+		return 1
+	fi
+	for addr in ${addrs}; do
+		# Strip the subnet
+		local ip="${addr%/*}" subnet="${addr#*/}"
+		# We don't work on private IPv4 addresses
+		if _ip6rd_inet_is_private_network "${ip}"
+		then
+			continue
+		fi
+
+		local ip6= ip6_prefix="${prefix%::/*}" ip6_subnet="${prefix#*/}"
+		ip6_subnet=$((ip6_subnet + (32-ipv4mask)))
+		eval ip6="$(printf "${ip6_prefix}:%s::%s" \
+		$(_ip6rd_prefix_shave_bits  ${ip} ${ipv4mask}) ${suffix})"
+		veinfo "Derived IPv6 address: ${ip6}"
+
+		# Now apply our IPv6 address to our config
+		config_ip6rd="${config_ip6rd}${config_ip6rd:+ }${ip6}/${ip6_subnet}"
+
+		if [ -n "${localip}" ]; then
+			localip="any"
+		else
+			localip="${ip}"
+		fi
+	done
+
+	if [ -z "${config_ip6rd}" ]; then
+		eerror "No global IPv4 addresses found on interface ${host}"
+		return 1
+	fi
+
+	ebegin "Creating 6rd tunnel ${IFACE}"
+	if [ "${IFACE}" != "sit0" ]; then
+		_tunnel add "${IFACE}" mode sit ttl 255 remote any local "${localip}"
+	fi
+	_tunnel 6rd dev "${IFACE}" 6rd-prefix "${prefix}"
+	eend $? || return 1
+	_up
+
+	routes_ip6rd="2003::/3 via ::${relay} metric 2147483647"
+	service_set_value "config_ip6rd_$IFVAR" "$config_ip6rd"
+	service_set_value "routes_ip6rd_$IFVAR" "$routes_ip6rd"
+}
+
+ip6rd_start()
+{
+	local config_ip6rd=$(service_get_value "config_ip6rd_$IFVAR")
+	local routes_ip6rd=$(service_get_value "routes_ip6rd_$IFVAR")
+
+	# Now apply our config
+	eval config_${config_index}=\'"${config_ip6rd}"\'
+	: $(( config_index -= 1 ))
+
+	# Add a route for us, ensuring we don't delete anything else
+	local routes="$(_get_array "routes_${IFVAR}")
+$routes_ip6rd"
+	eval routes_${IFVAR}=\$routes
+}
+
+_ip6rd_inet_atoi()
+{
+	local IFS="${IFS}." ipi=0 j=3
+	for i in $1 ; do
+	       ipi=$(( ipi | i << 8*j-- ))
+	done
+	echo ${ipi}
+}
+
+_ip6rd_inet_itoa()
+{
+	local ipi=$1
+	for i in 0 1 2 3; do
+		if [ $i != 3 ] ; then
+			printf "%d." $(( (ipi & ~((1<<24)-1)) >> 24 ))
+			ipi=$(( (ipi & ((1<<24)-1)) << 8))
+		else
+			printf "%d\n" $(( (ipi & ~((1<<24)-1)) >> 24 ))
+		fi
+	done
+}
+
+_ip6rd_inet_get_network()
+{
+	echo $(_ip6rd_inet_itoa $(( ($(_ip6rd_inet_atoi $1) & ((1<<$2)-1) << (32-$2) ) )) )
+}
+
+_ip6rd_inet_is_private_network()
+{
+	if [ "$(_ip6rd_inet_get_network $1 16)" = "192.168.0.0" ]\
+	  || [ "$(_ip6rd_inet_get_network $1 8)" = "10.0.0.0" ]\
+	  || [ "$(_ip6rd_inet_get_network $1 12)" = "172.16.0.0" ]\
+	  || [ "$(_ip6rd_inet_get_network $1 16)" = "169.254.0.0" ]
+	then
+		return 0;
+	fi
+	return 1;
+}
+
+_ip6rd_prefix_shave_bits()
+{
+	local ipi=
+	ipi=$((  ($(_ip6rd_inet_atoi $1) & (1<<(32-$2))-1) << $2))
+	if [ $2 -le 16 ]
+	then
+		printf "%04x:%0$(( (16-$2>>2)+(($2%4)?1:0) ))x" \
+		$((ipi >> 16)) $((ipi & (1<<(16-$2))-1))
+	elif [ $2 -lt 32 ]
+	then
+		printf "%0$(( (32-$2>>2)+(($2%4)?1:0) ))x" \
+		$((ipi >> 16))
+	fi	
+}

[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     fb00b10669a0b191ba0467f035d45b77bedd9f09
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 25 18:30:33 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Jan 25 18:47:37 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=fb00b106

net/bonding: Fix which interface IPs get added to.

The previous bonding change of ensuring interfaces were down to add
slave interfaces, but it clobbered the IFACE variable, because it was
being passed to a bash function rather than a command.

X-Gentoo-Bug: 400613
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=400613
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 net/bonding.sh |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/net/bonding.sh b/net/bonding.sh
index 6a83a8c..21c00e3 100644
--- a/net/bonding.sh
+++ b/net/bonding.sh
@@ -102,15 +102,21 @@ bonding_pre_start()
 	eoutdent
 	if [ -d /sys/class/net ]; then
 		sys_bonding_path=/sys/class/net/"${IFACE}"/bonding
+		local oiface
+		oiface=$IFACE
 		if [ -n "${primary}" ]; then
-			IFACE=$primary _down
+			IFACE=$primary 
+			_down
+			IFACE=$oiface
 			echo "+${primary}" >$sys_bonding_path/slaves
 			echo "${primary}" >$sys_bonding_path/primary
 		fi
 		for s in ${slaves}; do
 			[ "${s}" = "${primary}" ] && continue
 			if ! grep -q ${s} $sys_bonding_path/slaves; then
-				IFACE=$s _down
+				IFACE=$s 
+				_down
+				IFACE=$oiface
 				echo "+${s}" >$sys_bonding_path/slaves
 			fi
 		done

[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     fdc8849e5686a13c6cb5401af5805ae649035eb0
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 16 17:33:09 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jan 16 17:33:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=fdc8849e

net/ethtool: Fix program call.

I missed removing a call to the old ethtool function wrapper that was
made unneeded by commit d02d3af02.

X-Gentoo-Bug: 399037
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=399037
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 net/ethtool.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/ethtool.sh b/net/ethtool.sh
index 4e10409..6023d74 100644
--- a/net/ethtool.sh
+++ b/net/ethtool.sh
@@ -39,7 +39,7 @@ ethtool_pre_start() {
 			args_pretty="--${opt} $IFACE ${args_pretty}"
 			args="--${opt} $IFACE ${args}"
 			ebegin "ethtool ${args_pretty}"
-			$(_ethtool) ${args}
+			ethtool ${args}
 			rc=$?
 			eend $rc "ethtool exit code $rc"
 			# TODO: ethtool has MANY different exit codes, with no

[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     e7649f117af827a855baeaa2fc72a5cf1a09f31c
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 04:38:31 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 04:38:31 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=e7649f11

net/iproute2: Handle shortened arguments

Allow users to shorten iproute arguments to the shortest unique argument
that will match a flag of iproute2.

X-Gentoo-Bug: 398721
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=398721

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 net/iproute2.sh |   35 +++++++++++++++++++++++------------
 1 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/net/iproute2.sh b/net/iproute2.sh
index 9b89352..09912bf 100644
--- a/net/iproute2.sh
+++ b/net/iproute2.sh
@@ -101,24 +101,35 @@ _add_address()
 		ip addr add "$@" dev "${IFACE}" 2>/dev/null
 		return 0
 	fi
-
+	local x
 	local address netmask broadcast peer anycast label scope
 	local valid_lft preferred_lft home nodad
 	local confflaglist
 	address="$1" ; shift
 	while [ -n "$*" ]; do
-		case "$1" in
-			netmask)
-				netmask="/$(_netmask2cidr "$2")" ; shift ; shift ;;
-			broadcast|brd)
-				broadcast="$2" ; shift ; shift ;;
-			pointopoint|pointtopoint|peer)
-				peer="$2" ; shift ; shift ;;
-			anycast|label|scope|valid_lft|preferred_lft)
-				eval "$1=$2" ; shift ; shift ;;
-			home|nodad)
+		x=$1 ; shift
+		case "$x" in
+			netmask|ne*)
+				netmask="/$(_netmask2cidr "$1")" ; shift ;;
+			broadcast|brd|br*)
+				broadcast="$1" ; shift ;;
+			pointopoint|pointtopoint|peer|po*|pe*)
+				peer="$1" ; shift ;;
+			anycast|label|scope|valid_lft|preferred_lft|a*|l*|s*|v*|pr*)
+				case $x in
+					a*) x=anycast ;;
+					l*) x=label ;;
+					s*) x=scope ;;
+					v*) x=valid_lft ;;
+					pr*) x=preferred_lft ;;
+				esac
+				eval "$x=$1" ; shift ;;
+			home|nodad|h*|no*)
+				case $x in h*) x=home ;; n*) x=nodad ;; esac
 				# FIXME: If we need to reorder these, this will take more code
-				confflaglist="${confflaglist} $1" ; shift ;;
+				confflaglist="${confflaglist} $x" ; ;;
+			*)
+				ewarn "Unknown argument to config_$IFACE: $x"
 		esac
 	done
 

[gentoo-commits] proj/openrc:master commit in: net/

[William Hubbs]

commit:     d02d3af02e4254b04949de546c5d53af82cc2fc2
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  7 21:47:48 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Jan  7 21:47:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=d02d3af0

net: make lookup of ethtool dynamic

The ethtool module checked in two places for the ethtool binary; now we
look for it in the path.

---
 net/ethtool.sh |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/net/ethtool.sh b/net/ethtool.sh
index fecb7b9..ba5719d 100644
--- a/net/ethtool.sh
+++ b/net/ethtool.sh
@@ -1,13 +1,12 @@
 # Copyright (c) 2011 by Gentoo Foundation
 # Released under the 2-clause BSD license.
 
-_ethtool() {
-	echo /usr/sbin/ethtool
-}
-
 ethtool_depend()
 {
-	program $(_ethtool)
+	local x
+	x=$(_which ethtool)
+	[ -z "$x" ] && return 1
+	program $x
 	before interface
 }
 

[gentoo-commits] proj/openrc:master commit in: net/

[William Hubbs]

commit:     61e05331d14a08fa909526fda15470a1ca4927dd
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  7 21:41:43 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Jan  7 21:41:43 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=61e05331

net: make lookup of iproute2 dynamic

The iproute2, macvlan and vlan modules had several possible hard coded
paths for the iproute2 binary. Now we look for it in the path.

---
 net/iproute2.sh |   14 ++++----------
 net/macvlan.sh  |   14 ++++----------
 net/vlan.sh     |   14 ++++----------
 3 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/net/iproute2.sh b/net/iproute2.sh
index bb52e98..16d9a60 100644
--- a/net/iproute2.sh
+++ b/net/iproute2.sh
@@ -1,18 +1,12 @@
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
-_ip()
-{
-	if [ -x /bin/ip ]; then
-		echo /bin/ip
-	else
-		echo /sbin/ip
-	fi
-}
-
 iproute2_depend()
 {
-	program $(_ip)
+	local x
+	x=$(_which ip)
+	[ -z "$x" ] && return 1
+	program $x
 	provide interface
 	after ifconfig
 }

diff --git a/net/macvlan.sh b/net/macvlan.sh
index 422268e..ccb28ea 100644
--- a/net/macvlan.sh
+++ b/net/macvlan.sh
@@ -3,18 +3,12 @@
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # All rights reserved. Released under the 2-clause BSD license.
 
-_ip()
-{
-	if [ -x /bin/ip ]; then
-		echo /bin/ip
-	else
-		echo /sbin/ip
-	fi
-}
-
 macvlan_depend()
 {
-	program $(_ip)
+	local x
+	x=$(_which ip)
+	[ -z "${X}" ] && return 1
+	program $x
 	after interface
 	before dhcp macchanger
 }

diff --git a/net/vlan.sh b/net/vlan.sh
index 960cd09..ec30dd6 100644
--- a/net/vlan.sh
+++ b/net/vlan.sh
@@ -1,18 +1,12 @@
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
-_ip()
-{
-	if [ -x /bin/ip ]; then
-		echo /bin/ip
-	else
-		echo /sbin/ip
-	fi
-}
-
 vlan_depend()
 {
-	program $(_ip)
+	local x
+	x=$(_which ip)
+	[ -z "$x" ] && return 1
+	program $x
 	after interface
 	before dhcp
 }

[gentoo-commits] proj/openrc:master commit in: net/

[William Hubbs]

commit:     84aa4ba8182ffe69ddaa81e94e53a63af155fc1b
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  6 20:51:43 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Jan  6 20:51:43 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=84aa4ba8

Revert "net/ifconfig net/iproute2: support lookup ifconfig/ip dynamically"

This reverts commit f583030e3cbfb1d2f30af3ebd00427e12fe66b70.

The previous commit did not account for the case of not having iproute2
installed.

Reported-by: Duncan <1i5t5.duncan <AT> cox.net>
X-Gentoo-Bug: 397875
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=397875

---
 net/ifconfig.sh.Linux.in |   11 +----------
 net/iproute2.sh          |    2 +-
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/net/ifconfig.sh.Linux.in b/net/ifconfig.sh.Linux.in
index 2ac63fd..80a0b98 100644
--- a/net/ifconfig.sh.Linux.in
+++ b/net/ifconfig.sh.Linux.in
@@ -1,18 +1,9 @@
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
-_ifconfig()
-{
-	if [ -x /bin/ifconfig ]; then
-		echo /bin/ifconfig
-	else
-		which ifconfig 2>/dev/null
-	fi
-}
-
 ifconfig_depend()
 {
-	program $(_ifconfig)
+	program /sbin/ifconfig
 	provide interface
 }
 

diff --git a/net/iproute2.sh b/net/iproute2.sh
index 23ada48..bb52e98 100644
--- a/net/iproute2.sh
+++ b/net/iproute2.sh
@@ -6,7 +6,7 @@ _ip()
 	if [ -x /bin/ip ]; then
 		echo /bin/ip
 	else
-		which ip 2>/dev/null
+		echo /sbin/ip
 	fi
 }
 

[gentoo-commits] proj/openrc:master commit in: net/

[Mike Frysinger]

commit:     f583030e3cbfb1d2f30af3ebd00427e12fe66b70
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  4 21:37:33 2012 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Jan  4 21:38:11 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=f583030e

net/ifconfig net/iproute2: support lookup ifconfig/ip dynamically

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 net/ifconfig.sh.Linux.in |   11 ++++++++++-
 net/iproute2.sh          |    2 +-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/net/ifconfig.sh.Linux.in b/net/ifconfig.sh.Linux.in
index 80a0b98..2ac63fd 100644
--- a/net/ifconfig.sh.Linux.in
+++ b/net/ifconfig.sh.Linux.in
@@ -1,9 +1,18 @@
 # Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
 # Released under the 2-clause BSD license.
 
+_ifconfig()
+{
+	if [ -x /bin/ifconfig ]; then
+		echo /bin/ifconfig
+	else
+		which ifconfig 2>/dev/null
+	fi
+}
+
 ifconfig_depend()
 {
-	program /sbin/ifconfig
+	program $(_ifconfig)
 	provide interface
 }
 

diff --git a/net/iproute2.sh b/net/iproute2.sh
index bb52e98..23ada48 100644
--- a/net/iproute2.sh
+++ b/net/iproute2.sh
@@ -6,7 +6,7 @@ _ip()
 	if [ -x /bin/ip ]; then
 		echo /bin/ip
 	else
-		echo /sbin/ip
+		which ip 2>/dev/null
 	fi
 }
 

[gentoo-commits] proj/openrc:master commit in: net/

[William Hubbs]

commit:     2471d741f7d12382ba22a9efac0418293c7a74d5
Author:     Marien Zwart <marienz <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 30 01:10:32 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Dec 30 01:10:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=2471d741

net:macvlan: bring up the interface

X-Gentoo-Bug: 396429
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=396429

---
 net/macvlan.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/macvlan.sh b/net/macvlan.sh
index fb5fcdb..422268e 100644
--- a/net/macvlan.sh
+++ b/net/macvlan.sh
@@ -47,7 +47,7 @@ macvlan_pre_start()
 	if [ -n "${e}" ]; then
 		eend 1 "${e}"
 	else
-		eend 0 && service_set_value macvlan "${macvlan}"
+		eend 0 && _up && service_set_value macvlan "${macvlan}"
 	fi
 }
 

[gentoo-commits] proj/openrc:master commit in: net/

[William Hubbs]

commit:     759f4ca4f2a7ee6be9ed13e7fd3fcd9cce44d865
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 30 00:00:25 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Dec 30 00:00:25 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=759f4ca4

net: remove _check_macvlan function

This test is incorrect, and we do not need the modprobe. If macvlan is a
module, it is automatically modprobed when the first macvlan link is
added. Also, the /sys directory referred to in the test does not exist
if macvlan is built into the kernel.

Reported-by: Marien Zwart <marienz <AT> gentoo.org>
X-Gentoo-Bug: 396427
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=396427

---
 net/macvlan.sh |   13 -------------
 1 files changed, 0 insertions(+), 13 deletions(-)

diff --git a/net/macvlan.sh b/net/macvlan.sh
index b8a8ffa..fb5fcdb 100644
--- a/net/macvlan.sh
+++ b/net/macvlan.sh
@@ -24,17 +24,6 @@ _is_macvlan()
 	[ -n "$(export RC_SVCNAME="net.${IFACE}"; service_get_value macvlan)" ]
 }
 
-_check_macvlan()
-{
-	if [ ! -d /sys/module/macvlan ]; then
-		modprobe macvlan
-		if [ ! -d /sys/module/macvlan ]; then
-			eerror "MAC-VLAN support is not present in this kernel"
-			return 1
-		fi
-	fi
-}
-
 macvlan_pre_start()
 {
 	# MAC-VLAN needs an existing interface to link to
@@ -42,8 +31,6 @@ macvlan_pre_start()
 	eval macvlan=\$macvlan_${IFVAR}
 	[ -z "${macvlan}" ] && return 0
 
-	_check_macvlan || return 1
-
 	case " ${MODULES} " in
 		*" ifconfig "*)
 				eerror "sys-apps/iproute2 is required to configure MACVLANs"

[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     b12cb2f507b8ba7acc64e0e8172eb26bae00dc0a
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 28 20:31:02 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Dec 28 20:32:10 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=b12cb2f5

net/iproute2: POSIX sh compatability: ${x/a/b} invalid

The ${x/a/b} shell construct is NOT defined in the POSIX specification,
it's a bash addition.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 net/iproute2.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/iproute2.sh b/net/iproute2.sh
index 693efe0..bb52e98 100644
--- a/net/iproute2.sh
+++ b/net/iproute2.sh
@@ -138,7 +138,7 @@ _add_address()
 
 	# figure out the broadcast address if it is not specified
 	# This must NOT be set for IPv6 addresses
-	if [ "${address/:}" = "${address}" ]; then
+	if [ "${address#*:}" = "${address}" ]; then
 		[ -z "$broadcast" ] && broadcast="+"
 	elif [ -n "$broadcast" ]; then
 		eerror "Broadcast keywords are not valid with IPv6 addresses"

[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     5615325a8406c5691991381d4e9d760e4f84be58
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 01:56:26 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Dec 27 01:56:26 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=5615325a

net/vlan: Fix prestop when device was hard-removed already

During stop of an interface, if it has been removed already (eg
hotunplug), not existing is fine.

X-Gentoo-Bug: 395859
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=395859
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 net/vlan.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/vlan.sh b/net/vlan.sh
index ced5aa0..960cd09 100644
--- a/net/vlan.sh
+++ b/net/vlan.sh
@@ -123,7 +123,7 @@ vlan_pre_stop()
 {
 	local vlan=
 
-	_exists || return 1
+	_exists || return 0
 
 	for vlan in $(_get_vlans); do
 		einfo "Removing VLAN ${vlan##*.} from ${IFACE}"

[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     537171eac271e050191d03dd6f041fbf8355d782
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 01:51:28 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Dec 27 01:51:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=537171ea

Fix whitespace.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 net/iproute2.sh |    2 +-
 net/macvlan.sh  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/iproute2.sh b/net/iproute2.sh
index 21ec820..693efe0 100644
--- a/net/iproute2.sh
+++ b/net/iproute2.sh
@@ -353,7 +353,7 @@ iproute2_post_stop()
 			ip -4 route flush table cache dev "${IFACE}"
 		fi
 	fi
-	
+
 	# Kernel may not have IPv6 built in
 	if [ -e /proc/net/ipv6_route ]; then
 		local rules="$(service_get_value "ip6_rule")"

diff --git a/net/macvlan.sh b/net/macvlan.sh
index 8ac75b8..b8a8ffa 100644
--- a/net/macvlan.sh
+++ b/net/macvlan.sh
@@ -43,7 +43,7 @@ macvlan_pre_start()
 	[ -z "${macvlan}" ] && return 0
 
 	_check_macvlan || return 1
-	
+
 	case " ${MODULES} " in
 		*" ifconfig "*)
 				eerror "sys-apps/iproute2 is required to configure MACVLANs"

[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     415f48041056a020fa27cbd16bfd0be268bf693c
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 01:21:34 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Dec 27 01:22:29 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=415f4804

net/vlan, net/macvlan: iproute2 is required for new VLAN configuration

Since commit 683a21b0a in Feburary 2011, iproute2 has been required for
new VLAN configuration. MACVLAN is also impossible to configure without
iproute2. However we did not check if iproute2 was actually in the
modules for a given interface, so it could end up hanging or giving
weird errors. Check for iproute2 before usage now.

X-Gentoo-Bug: 389437
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=389437
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 net/macvlan.sh |    6 ++++++
 net/vlan.sh    |    8 ++++++++
 2 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/net/macvlan.sh b/net/macvlan.sh
index 92bcf1f..8ac75b8 100644
--- a/net/macvlan.sh
+++ b/net/macvlan.sh
@@ -43,6 +43,12 @@ macvlan_pre_start()
 	[ -z "${macvlan}" ] && return 0
 
 	_check_macvlan || return 1
+	
+	case " ${MODULES} " in
+		*" ifconfig "*)
+				eerror "sys-apps/iproute2 is required to configure MACVLANs"
+				return 1 ;;
+	esac
 
 	# optional mode, default to "private"
 	local mode=

diff --git a/net/vlan.sh b/net/vlan.sh
index 9cce3b9..ced5aa0 100644
--- a/net/vlan.sh
+++ b/net/vlan.sh
@@ -51,6 +51,14 @@ vlan_pre_start()
 		eerror "You must convert your vconfig_ VLAN entries to vlan${N} entries."
 		return 1
 	fi
+	local vlans=
+	eval vlans=\$vlans_${IFVAR}
+	[ -z "$vlans" ] && return 0
+	case " ${MODULES} " in
+		*" ifconfig "*)
+				eerror "sys-apps/iproute2 is required to configure VLANs"
+				return 1 ;;
+	esac
 }
 
 vlan_post_start()

[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     acf77b73afb8011a903d5ac88f6d6dcaf7b77a2f
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 27 01:07:41 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Dec 27 01:08:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=acf77b73

net/ip6to4: Split to use pre_start and start so that other tunnel names work.

We need to create interfaces of custom names before we can sucessfully
start them. To do this, we have to add tunnels during prestart instead
of start. Split up the ip6to4 script to do this, saving the computed
variables for use in start with the new service data commands.

X-Gentoo-Bug: 372575
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=372575
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 net/ip6to4.sh |   28 ++++++++++++++++++++++------
 1 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/net/ip6to4.sh b/net/ip6to4.sh
index 5569dee..959a2a0 100644
--- a/net/ip6to4.sh
+++ b/net/ip6to4.sh
@@ -8,8 +8,15 @@ ip6to4_depend()
 	after interface
 }
 
-ip6to4_start()
+ip6to4_pre_start()
 {
+	# ALL interfaces run pre_start blocks, not just those with something
+	# assigned, so we must check if we need to run on this interface before we
+	# do so.
+	local config
+	eval config=\$config_${IFVAR}
+	[ "$config" = "ip6to4" ] || return 0
+
 	case " ${MODULES} " in
 		*" ifconfig "*)
 			if [ "${IFACE}" != "sit0" ]; then
@@ -19,7 +26,7 @@ ip6to4_start()
 			fi
 	esac
 
-	local host= suffix= relay= addr= iface=${IFACE} new= localip=
+	local host= suffix= relay= addr= iface=${IFACE} config_ip6to4= localip=
 	eval host=\$link_${IFVAR}
 	if [ -z "${host}" ]; then
 		eerror "link_${IFVAR} not set"
@@ -67,7 +74,7 @@ ip6to4_start()
 		veinfo "Derived IPv6 address: ${ip6}"
 
 		# Now apply our IPv6 address to our config
-		new="${new}${new:+ }${ip6}/48"
+		config_ip6to4="${config_ip6to4}${config_ip6to4:+ }${ip6}/48"
 
 		if [ -n "${localip}" ]; then
 			localip="any"
@@ -76,7 +83,7 @@ ip6to4_start()
 		fi
 	done
 
-	if [ -z "${new}" ]; then
+	if [ -z "${config_ip6to4}" ]; then
 		eerror "No global IPv4 addresses found on interface ${host}"
 		return 1
 	fi
@@ -87,13 +94,22 @@ ip6to4_start()
 		eend $? || return 1
 		_up
 	fi
+	routes_ip6to4="2003::/3 via ::${relay} metric 2147483647"
+	service_set_value "config_ip6to4_$IFVAR" "$config_ip6to4"
+	service_set_value "routes_ip6to4_$IFVAR" "$routes_ip6to4"
+}
+
+ip6to4_start()
+{
+	local config_ip6to4=$(service_get_value "config_ip6to4_$IFVAR")
+	local routes_ip6to4=$(service_get_value "routes_ip6to4_$IFVAR")
 
 	# Now apply our config
-	eval config_${config_index}=\'"${new}"\'
+	eval config_${config_index}=\'"${config_ip6to4}"\'
 	: $(( config_index -= 1 ))
 
 	# Add a route for us, ensuring we don't delete anything else
 	local routes="$(_get_array "routes_${IFVAR}")
-2003::/3 via ::${relay} metric 2147483647"
+$routes_ip6to4"
 	eval routes_${IFVAR}=\$routes
 }

[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     8bb4b759eb23004e8c6d5f9e267854624c70e354
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 21 08:03:38 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Dec 21 08:08:31 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=8bb4b759

net/iproute2: IPv6 cannot be used with broadcast

Broadcast and IPv6 should not be used together. Do not try to set the
keyword for auto-generation of the broadcast address. If the user passes
a broadcast address for IPv6, throw an error.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 net/iproute2.sh |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/net/iproute2.sh b/net/iproute2.sh
index c3bb9c8..4c7fbdc 100644
--- a/net/iproute2.sh
+++ b/net/iproute2.sh
@@ -137,8 +137,14 @@ _add_address()
 	fi
 
 	# figure out the broadcast address if it is not specified
-	# FIXME: I'm not sure if this should be set if we are passing a peer arg
-	[ -z "$broadcast" ] && broadcast="+"
+	# This must NOT be set for IPv6 addresses
+	if [ "${address/:}" = "${address}" ]; then
+		# FIXME: I'm not sure if this should be set if we are passing a peer arg
+		[ -z "$broadcast" ] && broadcast="+"
+	elif [ -n "$broadcast" ]; then
+		eerror "Broadcast keywords are not valid with IPv6 addresses"
+		return 1
+	fi
 
 	# This must appear on a single line, continuations cannot be used
 	set -- "${address}${netmask}" ${peer:+peer} ${peer} ${broadcast:+broadcast} ${broadcast} ${anycast:+anycast} ${anycast} ${label:+label} ${label} ${scope:+scope} ${scope} dev "${IFACE}" ${valid_lft:+valid_lft} $valid_lft ${preferred_lft:+preferred_lft} $preferred_lft $confflaglist

[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     7b1c1e16230abae1be4c0c237665ea7629d7ef28
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 21 08:10:47 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Dec 21 08:10:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=7b1c1e16

net/iproute2: Confirmed that broadcast and peer can be used together.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 net/iproute2.sh |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/net/iproute2.sh b/net/iproute2.sh
index 4c7fbdc..21ec820 100644
--- a/net/iproute2.sh
+++ b/net/iproute2.sh
@@ -139,7 +139,6 @@ _add_address()
 	# figure out the broadcast address if it is not specified
 	# This must NOT be set for IPv6 addresses
 	if [ "${address/:}" = "${address}" ]; then
-		# FIXME: I'm not sure if this should be set if we are passing a peer arg
 		[ -z "$broadcast" ] && broadcast="+"
 	elif [ -n "$broadcast" ]; then
 		eerror "Broadcast keywords are not valid with IPv6 addresses"

[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     e5eb062f050d96a70f72ee78f431f774c98b24e2
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 21 07:44:53 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Dec 21 08:02:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=e5eb062f

net/iproute2: iproute2 flag handling

Several of the optional flags were not being handled correctly, they
were being passed as values only, without the keyword before them.
Affected keywords: anycast, label, scope, valid_lft, preferred_lft

Also change the handling of keywords to a common setup now, making
broadcast and peer strings the same as the above keywords.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 net/iproute2.sh |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/net/iproute2.sh b/net/iproute2.sh
index c8f670c..c3bb9c8 100644
--- a/net/iproute2.sh
+++ b/net/iproute2.sh
@@ -113,31 +113,35 @@ _add_address()
 
 	local address netmask broadcast peer anycast label scope
 	local valid_lft preferred_lft home nodad
+	local confflaglist
 	address="$1" ; shift
 	while [ -n "$*" ]; do
 		case "$1" in
 			netmask)
 				netmask="/$(_netmask2cidr "$2")" ; shift ; shift ;;
 			broadcast|brd)
-				broadcast="broadcast $2" ; shift ; shift ;;
+				broadcast="$2" ; shift ; shift ;;
 			pointopoint|pointtopoint|peer)
-				peer="peer $2" ; shift ; shift ;;
+				peer="$2" ; shift ; shift ;;
 			anycast|label|scope|valid_lft|preferred_lft)
 				eval "$1=$2" ; shift ; shift ;;
 			home|nodad)
-				eval "$1=$1" ; shift ;;
+				# FIXME: If we need to reorder these, this will take more code
+				confflaglist="${confflaglist} $1" ; shift ;;
 		esac
 	done
 
 	# Always scope lo addresses as host unless specified otherwise
 	if [ "${IFACE}" = "lo" ]; then
-		[ -z "$scope" ] && scope="scope host"
+		[ -z "$scope" ] && scope="host"
 	fi
 
 	# figure out the broadcast address if it is not specified
-	[ -z "$broadcast" ] && broadcast="broadcast +"
+	# FIXME: I'm not sure if this should be set if we are passing a peer arg
+	[ -z "$broadcast" ] && broadcast="+"
 
-	set -- "${address}${netmask}" $peer $broadcast $anycast $label $scope dev "${IFACE}" $valid_lft $preferred_lft $home $nodad
+	# This must appear on a single line, continuations cannot be used
+	set -- "${address}${netmask}" ${peer:+peer} ${peer} ${broadcast:+broadcast} ${broadcast} ${anycast:+anycast} ${anycast} ${label:+label} ${label} ${scope:+scope} ${scope} dev "${IFACE}" ${valid_lft:+valid_lft} $valid_lft ${preferred_lft:+preferred_lft} $preferred_lft $confflaglist
 	veinfo ip addr add "$@"
 	ip addr add "$@"
 }

[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     879e1acd5dc04eee1f7b0cb49d9c1a84e28c525c
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 13 08:43:18 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Dec 13 08:43:18 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=879e1acd

net: Support more variants of address family specification.

This includes address family specifications methods to help debug bug
358235 further.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 net/ifconfig.sh.Linux.in |    6 ++++++
 net/iproute2.sh          |   11 +++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/net/ifconfig.sh.Linux.in b/net/ifconfig.sh.Linux.in
index 1ac0dd5..80a0b98 100644
--- a/net/ifconfig.sh.Linux.in
+++ b/net/ifconfig.sh.Linux.in
@@ -188,6 +188,12 @@ _add_route()
 	if [ "$1" = "-A" -o "$1" = "-f" -o "$1" = "-family" ]; then
 		family="-A $2"
 		shift; shift
+	elif [ "$1" = "-4" ]; then
+	    family="-A inet"
+		shift
+	elif [ "$1" = "-6" ]; then
+	    family="-A inet6"
+		shift
 	fi
 
 	if [ -n "${metric}" ]; then

diff --git a/net/iproute2.sh b/net/iproute2.sh
index 4e7e88c..c8f670c 100644
--- a/net/iproute2.sh
+++ b/net/iproute2.sh
@@ -149,6 +149,12 @@ _add_route()
 	if [ "$1" = "-A" -o "$1" = "-f" -o "$1" = "-family" ]; then
 		family="-f $2"
 		shift; shift
+	elif [ "$1" = "-4" ]; then
+	    family="-f inet"
+		shift
+	elif [ "$1" = "-6" ]; then
+	    family="-f inet6"
+		shift
 	fi
 
 	if [ $# -eq 3 ]; then
@@ -212,10 +218,7 @@ _trim() {
 # This allows for advanced routing tricks
 _ip_rule_runner() {
 	local cmd rules OIFS="${IFS}" family
-	if [ "x$1" = "-4" ]; then
-		family="$1"
-		shift
-	elif [ "x$1" = "-6" ]; then
+	if [ "$1" = "-4" -o "$1" = "-6" ]; then
 		family="$1"
 		shift
 	else

[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     ac2391e0cba6b9b19660de1a76c5609cc0d3b05e
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 13 06:52:09 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Dec 13 06:52:09 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=ac2391e0

net/vlan: Fix mtu setting

Fix minor shell typo that broke setting mtu on vlans.

X-Gentoo-Bug: 392971
X-Gentoo-Bug-URL: https://bugs.gentoo.org/392971
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 net/vlan.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/vlan.sh b/net/vlan.sh
index 6eed36b..9cce3b9 100644
--- a/net/vlan.sh
+++ b/net/vlan.sh
@@ -85,7 +85,7 @@ vlan_post_start()
 		eval broadcast=\$broadcast_vlan${vlan}
 		local mtu=
 		eval mtu=\$mtu_vlan${vlan}
-		local opts="${txqueuelen:+txqueuelen} ${txqueuelen} ${mac:+address} ${mac} ${broadcast:+broadcast} ${broadcast} ${mtu+:mtu} ${mtu}"
+		local opts="${txqueuelen:+txqueuelen} ${txqueuelen} ${mac:+address} ${mac} ${broadcast:+broadcast} ${broadcast} ${mtu:+mtu} ${mtu}"
 
 		e="$(ip link add link "${IFACE}" name "${vname}" ${opts} type vlan id "${vlan}" ${vflags} ${vingress} ${vegress} 2>&1 1>/dev/null)"
 		if [ -n "${e}" ]; then

[gentoo-commits] proj/openrc:master commit in: net/

[William Hubbs]

commit:     ce9994f7caa3a82575b61b944b69b518b3508710
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 13 06:25:58 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Dec 13 06:25:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=ce9994f7

net/tuntap: fix return code when tools can't be found

This module should return failure if iproute2, openvpn or tunctl cannot
be found. Before it was returning success; this fixes the issue.

---
 net/tuntap.sh |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/net/tuntap.sh b/net/tuntap.sh
index 45a80fe..679b097 100644
--- a/net/tuntap.sh
+++ b/net/tuntap.sh
@@ -16,6 +16,7 @@ _is_tuntap()
 tuntap_pre_start()
 {
 	local tuntap=
+	local rc=
 	eval tuntap=\$tuntap_${IFVAR}
 
 	[ -z "${tuntap}" ] && return 0
@@ -66,16 +67,20 @@ tuntap_pre_start()
 
 	if ${do_iproute2}; then
 		ip tuntap add dev "${IFACE}" mode "${tuntap}" ${i_opts}
+		rc=$?
 	elif ${do_openvpn}; then
 		openvpn --mktun --dev-type "${tuntap}" --dev "${IFACE}" \
 			${o_opts} >/dev/null
+		rc=$?
 	elif ${do_tunctl}; then
 		tunctl ${t_opts} -t "${IFACE}" >/dev/null
+		rc=$?
 	else
 		eerror "Neither iproute2, openvpn nor tunctl has been found, please install"
 		eerror "either \"iproute2\" \"openvpn\" or \"usermode-utilities\"."
+		rc=1
 	fi
-	eend $? && _up && service_set_value tuntap "${tuntap}"
+	eend $rc && _up && service_set_value tuntap "${tuntap}"
 }
 
 tuntap_post_stop()

[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     2569eb644e6e8e010a44a693e7dfa86e73c0d750
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 13 02:48:11 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Dec 13 03:20:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=2569eb64

net/ifconfig, net/iproute2: admin/oper state check functions

Provide consistent methods using iproute2/ifconfig to check operational
and administrative up/down state of interfaces. This is not the same as
ethtool's "Link detected" field, which is the state of the layer 2
medium.

TODO: How to check operational state in BSD?

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 net/ifconfig.sh.BSD.in   |   20 ++++++++++++++++++++
 net/ifconfig.sh.Linux.in |   23 +++++++++++++++++++++++
 net/iproute2.sh          |   23 +++++++++++++++++++++++
 3 files changed, 66 insertions(+), 0 deletions(-)

diff --git a/net/ifconfig.sh.BSD.in b/net/ifconfig.sh.BSD.in
index 15c8fb8..c7e98a2 100644
--- a/net/ifconfig.sh.BSD.in
+++ b/net/ifconfig.sh.BSD.in
@@ -242,3 +242,23 @@ ifconfig_post_start()
 		eend 0
 	fi
 }
+
+# Is the interface administratively/operationally up?
+# The 'UP' status in ifconfig is the administrative status
+# Operational state does not seem to be available in BSD?
+# 0: up
+# 1: down
+# 2: invalid arguments
+is_admin_up()
+{
+	local iface="$1"
+	[ -z "$iface" ] && iface="$IFACE"
+	ifconfig "${iface}" | \
+	sed -n '1,1{ /flags=.*[<,]UP[,>]/{ q 0 }}; q 1; '
+}
+
+is_oper_up()
+{
+	eerror "TODO: is_oper_up not available on BSD"
+	return 2
+}

diff --git a/net/ifconfig.sh.Linux.in b/net/ifconfig.sh.Linux.in
index dcbd628..1ac0dd5 100644
--- a/net/ifconfig.sh.Linux.in
+++ b/net/ifconfig.sh.Linux.in
@@ -297,3 +297,26 @@ ifconfig_post_stop()
 	iptunnel del "${IFACE}"
 	eend $?
 }
+
+# Is the interface administratively/operationally up?
+# The 'UP' status in ifconfig/iproute2 is the administrative status
+# Operational state is available in iproute2 output as 'state UP', or the
+# operstate sysfs variable.
+# 0: up
+# 1: down
+# 2: invalid arguments
+is_admin_up()
+{
+	local iface="$1"
+	[ -z "$iface" ] && iface="$IFACE"
+	ifconfig "${iface}" | \
+	sed -n '1,1{ /flags=.*[<,]UP[,>]/{ q 0 }}; q 1; '
+}
+
+is_oper_up()
+{
+	local iface="$1"
+	[ -z "$iface" ] && iface="$IFACE"
+	read state </sys/class/net/"${iface}"/operstate
+	[ "x$state" = "up" ]
+}

diff --git a/net/iproute2.sh b/net/iproute2.sh
index 214841e..e177c6d 100644
--- a/net/iproute2.sh
+++ b/net/iproute2.sh
@@ -327,3 +327,26 @@ iproute2_post_stop()
 		fi
 	fi
 }
+
+# Is the interface administratively/operationally up?
+# The 'UP' status in ifconfig/iproute2 is the administrative status
+# Operational state is available in iproute2 output as 'state UP', or the
+# operstate sysfs variable.
+# 0: up
+# 1: down
+# 2: invalid arguments
+is_admin_up()
+{
+	local iface="$1"
+	[ -z "$iface" ] && iface="$IFACE"
+	ip link show dev $iface | \
+	sed -n '1,1{ /[<,]UP[,>]/{ q 0 }}; q 1; '
+}
+
+is_oper_up()
+{
+	local iface="$1"
+	[ -z "$iface" ] && iface="$IFACE"
+	read state </sys/class/net/"${iface}"/operstate
+	[ "x$state" = "up" ]
+}

[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     dd45506a40f3332cef96cc8ca7e258561a200ec0
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 13 02:12:35 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Dec 13 03:20:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=dd45506a

net/bonding: ensure slave interfaces are down before adding.

The old ifenslave binary forcibly set new slave interface to down before
adding into the kernel, as a way of show it's version to the kernel. We
need to duplicate this so that the kernel doesn't think it's an old
ifenslave version using the bonding setup interface.

X-Gentoo-Bug: 391881
X-Gentoo-Bug-URL: https://bugs.gentoo.org/391881
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
Thanks-to: Yun Zheng Hu <hu <AT> fox-it.com>

---
 net/bonding.sh |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/net/bonding.sh b/net/bonding.sh
index 5ccd1f5..6a83a8c 100644
--- a/net/bonding.sh
+++ b/net/bonding.sh
@@ -95,16 +95,22 @@ bonding_pre_start()
 	_up
 
 	# finally add in slaves
+	# things needed in the process, and if they are done by ifenslave, openrc, and/or the kernel.
+	# down new slave interface: ifenslave, openrc
+	# set mtu: ifenslave, kernel
+	# set slave MAC: ifenslave, kernel
 	eoutdent
 	if [ -d /sys/class/net ]; then
 		sys_bonding_path=/sys/class/net/"${IFACE}"/bonding
 		if [ -n "${primary}" ]; then
+			IFACE=$primary _down
 			echo "+${primary}" >$sys_bonding_path/slaves
 			echo "${primary}" >$sys_bonding_path/primary
 		fi
 		for s in ${slaves}; do
 			[ "${s}" = "${primary}" ] && continue
 			if ! grep -q ${s} $sys_bonding_path/slaves; then
+				IFACE=$s _down
 				echo "+${s}" >$sys_bonding_path/slaves
 			fi
 		done

[gentoo-commits] proj/openrc:master commit in: net/

[William Hubbs]

commit:     8ea1190486f9194bac9dfcb355021ebc8e8c15ce
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 03:57:00 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 03:57:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=8ea11904

ip6to4: set correct subnet mask

The correct setting for this is /48.

Reported-by: MaratIK <marat.buharov <AT> gmail.com>
X-Gentoo-Bug: 392723
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=392723

---
 net/ip6to4.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/ip6to4.sh b/net/ip6to4.sh
index 4564450..5569dee 100644
--- a/net/ip6to4.sh
+++ b/net/ip6to4.sh
@@ -67,7 +67,7 @@ ip6to4_start()
 		veinfo "Derived IPv6 address: ${ip6}"
 
 		# Now apply our IPv6 address to our config
-		new="${new}${new:+ }${ip6}/16"
+		new="${new}${new:+ }${ip6}/48"
 
 		if [ -n "${localip}" ]; then
 			localip="any"

[gentoo-commits] proj/openrc:master commit in: net/

[William Hubbs]

commit:     a1c655949f1a44b130456bc0aceeb165dbf3bed8
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 02:49:26 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 02:49:26 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=a1c65594

iproute2: set a default broadcast address if none is specified

Reported-by: Spooky Ghost <spookyghost <AT> blueyounder.co.uk>
X-Gentoo-Bug: 392593
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=392593

---
 net/iproute2.sh |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/net/iproute2.sh b/net/iproute2.sh
index 91282ea..214841e 100644
--- a/net/iproute2.sh
+++ b/net/iproute2.sh
@@ -134,6 +134,9 @@ _add_address()
 		[ -z "$scope" ] && scope="scope host"
 	fi
 
+	# figure out the broadcast address if it is not specified
+	[ -z "$broadcast" ] && broadcast="broadcast +"
+
 	set -- "${address}${netmask}" $peer $broadcast $anycast $label $scope dev "${IFACE}" $valid_lft $preferred_lft $home $nodad
 	veinfo ip addr add "$@"
 	ip addr add "$@"

[gentoo-commits] proj/openrc:master commit in: net/

[William Hubbs]

commit:     483db945e11ef662e49cba3907b0be09c5b07fb3
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 23 14:17:33 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Nov 23 14:17:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=483db945

Fix typo

---
 net/system.sh |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/net/system.sh b/net/system.sh
index 65557fc..98017d5 100644
--- a/net/system.sh
+++ b/net/system.sh
@@ -13,7 +13,7 @@ system_depend()
 
 _system_dns()
 {
-	local servers= domain= search= sortlist= options= x=
+	local servers= domain= search= sortlist= options= x= imetric=
 
 	eval servers=\$dns_servers_${IFVAR}
 	[ -z "${servers}" ] && servers=${dns_servers}
@@ -47,8 +47,9 @@ _system_dns()
 	# Support resolvconf if we have it.
 	if [ -x /sbin/resolvconf ]; then
 		x="-a ${IFACE}"
-		if [ -n "${metric_${IFVAR}}" ]; then
-			x="${x} -m ${metric_${IFVAR}}"
+		eval imetric=\${metric_${IFVAR}}
+		if [ -n "${imetric}" ]; then
+			x="${x} -m ${imetric}"
 		fi
 		printf "${buffer}" | resolvconf ${x}
 	else

[gentoo-commits] proj/openrc:master commit in: net/

[William Hubbs]

commit:     76fec586336775ef8e313df3f8c3981c6b4fdfa8
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 21 03:27:38 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Nov 22 14:50:26 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=76fec586

pass the per-interface metric to resolvconf

Reported-by: Alon Bar-Lev <alon.barlev <AT> gmail.com>
x-Gentoo-Bug: 364907
x-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?364907

---
 net/system.sh |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/net/system.sh b/net/system.sh
index c451078..65557fc 100644
--- a/net/system.sh
+++ b/net/system.sh
@@ -46,7 +46,11 @@ _system_dns()
 
 	# Support resolvconf if we have it.
 	if [ -x /sbin/resolvconf ]; then
-		printf "${buffer}" | resolvconf -a "${IFACE}"
+		x="-a ${IFACE}"
+		if [ -n "${metric_${IFVAR}}" ]; then
+			x="${x} -m ${metric_${IFVAR}}"
+		fi
+		printf "${buffer}" | resolvconf ${x}
 	else
 		printf "${buffer}" > /etc/resolv.conf
 		chmod 644 /etc/resolv.conf

[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     f6c27abeb571d1025e2f2c7a53c734d21ad285cf
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  7 21:45:46 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Oct  7 21:47:46 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=f6c27abe

net/vlan: respect txqueuelen/mac/broadcast/mtu options during creation.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 net/vlan.sh |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/net/vlan.sh b/net/vlan.sh
index c7e5748..6eed36b 100644
--- a/net/vlan.sh
+++ b/net/vlan.sh
@@ -77,7 +77,17 @@ vlan_post_start()
 		eval vegress=\$vlan${vlan}_egress
 		[ -z "${vegress}" ] || vegress="egress-qos-map ${vegress}"
 
-		e="$(ip link add link "${IFACE}" name "${vname}" type vlan id "${vlan}" ${vflags} ${vingress} ${vegress} 2>&1 1>/dev/null)"
+		local txqueuelen=
+		eval txqueuelen=\$txqueuelen_vlan${vlan}
+		local mac=
+		eval mac=\$mac_vlan${vlan}
+		local broadcast=
+		eval broadcast=\$broadcast_vlan${vlan}
+		local mtu=
+		eval mtu=\$mtu_vlan${vlan}
+		local opts="${txqueuelen:+txqueuelen} ${txqueuelen} ${mac:+address} ${mac} ${broadcast:+broadcast} ${broadcast} ${mtu+:mtu} ${mtu}"
+
+		e="$(ip link add link "${IFACE}" name "${vname}" ${opts} type vlan id "${vlan}" ${vflags} ${vingress} ${vegress} 2>&1 1>/dev/null)"
 		if [ -n "${e}" ]; then
 			eend 1 "${e}"
 			continue

[gentoo-commits] proj/openrc:master commit in: net/

[Christian Ruppert]

commit:     4b6392987873107f83fa135b871ac137a6c29ba2
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 21 11:26:47 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Wed Sep 21 11:26:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=4b639298

Shutdown VLAN's before the actual/parent interface

Make sure the VLAN interfaces as well as its rules will be removed prior
to the actual/parent interface.
The VLAN configs are gone in vlan_post_stop() already so we have to use
vlan_pre_stop() instead.

Reported-by: Bernd Bednarz <bernd.bednarz <AT> avira.com>
X-Gentoo-Bug: 380603
X-Gentoo-Bug-URL: https://bugs.gentoo.org/380603

---
 net/vlan.sh |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/net/vlan.sh b/net/vlan.sh
index 164139b..c7e5748 100644
--- a/net/vlan.sh
+++ b/net/vlan.sh
@@ -101,10 +101,12 @@ vlan_post_start()
 	return 0
 }
 
-vlan_post_stop()
+vlan_pre_stop()
 {
 	local vlan=
 
+	_exists || return 1
+
 	for vlan in $(_get_vlans); do
 		einfo "Removing VLAN ${vlan##*.} from ${IFACE}"
 		(

[gentoo-commits] proj/openrc:master commit in: net/

[Christian Ruppert]

commit:     29693ecb7a031f6bacb74fd4dccfe0bdb1b1e5f8
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 21 01:57:09 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Wed Sep 21 01:57:09 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=29693ecb

Refactoring of commit bf49e59e3eb4fe12167812bc1b4531742eddc383

Make sure the RPDB rules will be removed.

---
 net/iproute2.sh |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/net/iproute2.sh b/net/iproute2.sh
index 765294a..660d514 100644
--- a/net/iproute2.sh
+++ b/net/iproute2.sh
@@ -301,9 +301,6 @@ iproute2_post_start()
 
 iproute2_post_stop()
 {
-	# Only do something if the interface actually exist
-	_exists || return
-
 	# Kernel may not have IP built in
 	if [ -e /proc/net/route ]; then
 		local rules="$(service_get_value "ip_rule")"
@@ -311,7 +308,11 @@ iproute2_post_stop()
 			einfo "Removing RPDB rules"
 			_ip_rule_runner del "${rules}"
 		fi
-		ip route flush table cache dev "${IFACE}"
+
+		# Only do something if the interface actually exist
+		if _exists; then
+			ip route flush table cache dev "${IFACE}"
+		fi
 	fi
 
 	# Don't delete sit0 as it's a special tunnel

[gentoo-commits] proj/openrc:master commit in: net/

[Christian Ruppert]

commit:     bf49e59e3eb4fe12167812bc1b4531742eddc383
Author:     Yun Zheng Hu <hu <AT> fox-it <DOT> com>
AuthorDate: Sun Sep 18 22:01:52 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 22:04:19 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=bf49e59e

Don't do anything if the interface doesn't exist

iproute2_post_stop() does now check if the network interface still exist.

Reported-by: Yun Zheng Hu <hu <AT> fox-it.com>
X-Gentoo-Bug: 379575
X-Gentoo-Bug-URL: https://bugs.gentoo.org/379575

---
 net/iproute2.sh |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/net/iproute2.sh b/net/iproute2.sh
index 2e02fbe..765294a 100644
--- a/net/iproute2.sh
+++ b/net/iproute2.sh
@@ -301,6 +301,9 @@ iproute2_post_start()
 
 iproute2_post_stop()
 {
+	# Only do something if the interface actually exist
+	_exists || return
+
 	# Kernel may not have IP built in
 	if [ -e /proc/net/route ]; then
 		local rules="$(service_get_value "ip_rule")"

[gentoo-commits] proj/openrc:master commit in: net/

[Christian Ruppert]

commit:     0e4d169a40e01d74cf5ff399afe049a25543f0f6
Author:     Gilles Oivier <g.olivier <AT> wanadoo <DOT> fr>
AuthorDate: Sun Sep 18 12:42:39 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Sun Sep 18 12:42:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=0e4d169a

Fix the Internal Field Seperator when using ethtool

ethtool.sh didn't reset the Internal Field Seperator (IFS) properly.
It now does, by storing the old IFS to OIFS, which will be used later
in the for loop.

It also fixes the "ethtool_ring_<if>" option.

Reported-by: Alois Schmid <alois.schmid <AT> gmx.de>
X-Gentoo-Bug: 368525
X-Gentoo-Bug-URL: https://bugs.gentoo.org/368525

---
 net/ethtool.sh |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/net/ethtool.sh b/net/ethtool.sh
index 21a22b6..fecb7b9 100644
--- a/net/ethtool.sh
+++ b/net/ethtool.sh
@@ -31,6 +31,7 @@ ethtool_pre_start() {
 		[ -z "${args}" ] && continue
 
 		# Split on \n
+		OIFS="${IFS}"
 		local IFS="$__IFS"
 
 		for p in ${args} ; do
@@ -38,6 +39,7 @@ ethtool_pre_start() {
 			local args_pretty="$(_trim "${p}")"
 			# Do nothing if empty
 			[ -z "${args_pretty}" ] && continue
+			[ "${opt}" = "ring" ] && opt="set-ring"
 			args_pretty="--${opt} $IFACE ${args_pretty}"
 			args="--${opt} $IFACE ${args}"
 			ebegin "ethtool ${args_pretty}"

[gentoo-commits] proj/openrc:master commit in: net/

[Christian Ruppert]

commit:     72e31e753d06797aca5e2463257e57575313f268
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 23:13:11 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 23:13:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=72e31e75

Improve missing openvpn/usermode-utilities warning message

as OpenRC can be used on other distributions as well.

---
 net/tuntap.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/tuntap.sh b/net/tuntap.sh
index 14ffddb..884e0ab 100644
--- a/net/tuntap.sh
+++ b/net/tuntap.sh
@@ -65,7 +65,7 @@ tuntap_pre_start()
 		tunctl ${t_opts} -t "${IFACE}" >/dev/null
 	else
 		eerror "Neither openvpn nor tunctl has been found, please install"
-		eerror "either net-misc/openvpn or sys-apps/usermode-utilities."
+		eerror "either \"openvpn\" or \"usermode-utilities\"."
 	fi
 	eend $? && _up && service_set_value tuntap "${tuntap}"
 }

[gentoo-commits] proj/openrc:master commit in: net/

[Christian Ruppert]

commit:     645bbf2e0f6be1f9f4cc116dfc39939456b771e3
Author:     Stefan Knoblich <s.knoblich <AT> axsentis <DOT> de>
AuthorDate: Fri Sep 16 22:06:00 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 22:16:10 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=645bbf2e

Parse broadcast arp responses via arping (iputils) properly

ARP replies may/do contain two MAC addresses when using iputils's
arping so we have to use the first one because it's always the "From"
address - which is what we want.

Thanks to Stefan Knoblich <s.knoblich <AT> axsentis.de> for the fixed pattern.

Reported-by: cl <AT> exomail.to
X-Gentoo-Bug: 379181
X-Gentoo-Bug-URL: https://bugs.gentoo.org/379181

---
 net/arping.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/arping.sh b/net/arping.sh
index ef1f9e7..b77d70c 100644
--- a/net/arping.sh
+++ b/net/arping.sh
@@ -40,7 +40,7 @@ arping_address()
 		[ -z "$(_get_inet_address)" ] && opts="${opts} -D"
 
 		foundmac="$(arping -w "${w}" ${opts} -f -I "${IFACE}" "${ip}" 2>/dev/null | \
-		sed -n -e 'y/abcdef/ABCDEF/' -e 's/.*\[\([^]]*\)\].*/\1/p')"
+			sed -n -e 'y/abcdef/ABCDEF/' -e 's/[^[]*\[\([^]]*\)\].*/\1/p')"
 	fi
 	[ -z "${foundmac}" ] && return 1
 

[gentoo-commits] proj/openrc:master commit in: net/

[Christian Ruppert]

commit:     539c4e58723fbd3b8ca9f30a09e99ddaf72c30b1
Author:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 21:47:20 2011 +0000
Commit:     Christian Ruppert <idl0r <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 21:48:44 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=539c4e58

Print a warning if openvpn/tunctl are missing

---
 net/tuntap.sh |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/net/tuntap.sh b/net/tuntap.sh
index 851a017..14ffddb 100644
--- a/net/tuntap.sh
+++ b/net/tuntap.sh
@@ -54,15 +54,18 @@ tuntap_pre_start()
 		do_tunctl=true
 	elif type openvpn >/dev/null 2>&1; then
 		do_openvpn=true
-	else
+	elif type tunctl >/dev/null 2>&1; then
 		do_tunctl=true
 	fi
 
 	if ${do_openvpn}; then
 		openvpn --mktun --dev-type "${tuntap}" --dev "${IFACE}" \
 			${o_opts} >/dev/null
-	else
+	elif ${do_tunctl}; then
 		tunctl ${t_opts} -t "${IFACE}" >/dev/null
+	else
+		eerror "Neither openvpn nor tunctl has been found, please install"
+		eerror "either net-misc/openvpn or sys-apps/usermode-utilities."
 	fi
 	eend $? && _up && service_set_value tuntap "${tuntap}"
 }

[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     6fa6f9523f80b2fcb49728b349f3eefc3e45a769
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 07:09:28 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 23:55:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=6fa6f952

Rewrite iproute2 addr argument parsing.

This was originally to fix the fact that our code did not handle certain
orders of arguments in conversion, but it was easier to rewrite the
entire argument handling to support more options at the same time.

Now supports all options documented in the ip manpage, including the
IPv6-specific options that must be passed after the interface argument.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
Reported-by: Tony Vroon <chainsaw <AT> gentoo.org>
X-Gentoo-Bug: 366905
X-Gentoo-Bug-URL: https://bugs.gentoo.org/366905

---
 net/iproute2.sh |   48 +++++++++++++++++++++---------------------------
 1 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/net/iproute2.sh b/net/iproute2.sh
index d76e60f..2e02fbe 100644
--- a/net/iproute2.sh
+++ b/net/iproute2.sh
@@ -111,38 +111,32 @@ _add_address()
 		return 0
 	fi
 
-	# Convert an ifconfig line to iproute2
-	if [ "$2" = "netmask" ]; then
-		local one="$1" three="$3"
-		shift; shift; shift
-		set -- "${one}/$(_netmask2cidr "${three}")" "$@"
-	fi
-
-	# tunnel keyword is 'peer' in iproute2, but 'pointopoint' in ifconfig.
-	if [ "$2" = "pointopoint" ]; then
-		local one="$1"
-		shift; shift
-		set -- "${one}" "peer" "$@"
-	fi
+	local address netmask broadcast peer anycast label scope
+	local valid_lft preferred_lft home nodad
+	address="$1" ; shift
+	while [ -n "$*" ]; do
+		case "$1" in
+			netmask)
+				netmask="/$(_netmask2cidr "$2")" ; shift ; shift ;;
+			broadcast|brd)
+				broadcast="broadcast $2" ; shift ; shift ;;
+			pointopoint|pointtopoint|peer)
+				peer="peer $2" ; shift ; shift ;;
+			anycast|label|scope|valid_lft|preferred_lft)
+				eval "$1=$2" ; shift ; shift ;;
+			home|nodad)
+				eval "$1=$1" ; shift ;;
+		esac
+	done
 
 	# Always scope lo addresses as host unless specified otherwise
 	if [ "${IFACE}" = "lo" ]; then
-		set -- "$@" "scope" "host"
+		[ -z "$scope" ] && scope="scope host"
 	fi
 
-	# IPv4 specifics
-	case "$1" in
-		*.*.*.*)
-			case "$@" in
-				*" brd "*);;
-				*" broadcast "*);;
-				*) set -- "$@" brd +;;
-			esac
-			;;
-	esac
-
-	veinfo ip addr add "$@" dev "${IFACE}"
-	ip addr add "$@" dev "${IFACE}"
+	set -- "${address}${netmask}" $peer $broadcast $anycast $label $scope dev "${IFACE}" $valid_lft $preferred_lft $home $nodad
+	veinfo ip addr add "$@"
+	ip addr add "$@"
 }
 
 _add_route()

[gentoo-commits] proj/openrc:master commit in: net/

[Mike Frysinger]

commit:     c427d3c1fec89f6a9281dccdc123bad73af80804
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 28 04:02:11 2011 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Jun 28 04:02:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=c427d3c1

net: ccwgroup: smooth up/down process

We need to bring the link up ourselves after we've properly configured
the device.  The common code tries to bring the link up itself, but it
does so before things are configured, and so it ends up failing.

When shutting down, we need to wait for the kernel to finish destroying
the interface.  Otherwise, when doing a restart, openrc is quick enough
to tell the kernel to destroy things, but then start trying to bring it
back up before the kernel has finished.

X-Gentoo-Bug: 367467
X-Gentoo-Bug-URL: http://bugs.gentoo.org/367467
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 net/ccwgroup.sh |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/net/ccwgroup.sh b/net/ccwgroup.sh
index 248b159..60cd25f 100644
--- a/net/ccwgroup.sh
+++ b/net/ccwgroup.sh
@@ -58,6 +58,11 @@ ccwgroup_pre_start()
 		echo "${val}" > /sys/devices/${ccw_type}/${first}/${var}
 	done
 	eend $?
+
+	# Now that we've properly configured the device, we can run
+	# bring the interface up.  Common code tried to do this already,
+	# but it failed because we didn't setup sysfs yet.
+	_up
 }
 
 ccwgroup_pre_stop()
@@ -88,9 +93,14 @@ ccwgroup_post_stop()
 	local device="$(service_get_value ccwgroup_device)"
 	[ -z "${device}" ] && return 0
 	local ccw_type="$(service_get_value ccwgroup_type)"
+	local path="/sys/devices/${ccw_type}/${device}"
 
 	einfo "Disabling ccwgroup/${ccw_type} on ${IFACE}"
-	echo "0" >/sys/devices/${ccw_type}/"${device}"/online
-	echo "1" >/sys/devices/${ccw_type}/"${device}"/ungroup
+	if echo "0" >"${path}"/online &&
+	   echo "1" >"${path}"/ungroup ; then
+		# The device doesn't disappear right away which breaks
+		# restart, or a quick start up, so wait around.
+		while [ -e "${path}" ] ; do :; done
+	fi
 	eend $?
 }

[gentoo-commits] proj/openrc:master commit in: net/

[William Hubbs]

commit:     fd48bc09fff09083b04b8cccad44092cceee9884
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 19:56:50 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon May 16 19:57:46 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=fd48bc09

net:bonding small style change for readability

---
 net/bonding.sh |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/net/bonding.sh b/net/bonding.sh
index 15f41e2..ae50ca4 100644
--- a/net/bonding.sh
+++ b/net/bonding.sh
@@ -104,8 +104,9 @@ bonding_pre_start()
 		fi
 		for s in ${slaves}; do
 			[ "${s}" = "${primary}" ] && continue
-			grep -q ${s} $sys_bonding_path/slaves \
-				|| echo "+${s}" >$sys_bonding_path/slaves
+			if ! grep -q ${s} $sys_bonding_path/slaves; then
+				echo "+${s}" >$sys_bonding_path/slaves
+			fi
 		done
 	else
 		/sbin/ifenslave "${IFACE}" ${slaves} >/dev/null

[gentoo-commits] proj/openrc:master commit in: net/

[Anthony G. Basile]

commit:     db1daa585737a03690d4d8e4040705b9c9c9c5ef
Author:     Kfir Lavi <lavi.kfir <AT> gmail <DOT> com>
AuthorDate: Mon May 16 13:21:18 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon May 16 13:21:18 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=db1daa58

Do not add slaves to bond interface if they are already added

X-Gentoo-Bug: 366653
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=366653
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

---
 net/bonding.sh |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/net/bonding.sh b/net/bonding.sh
index 6d15f0d..15f41e2 100644
--- a/net/bonding.sh
+++ b/net/bonding.sh
@@ -97,13 +97,15 @@ bonding_pre_start()
 	# finally add in slaves
 	eoutdent
 	if [ -d /sys/class/net ]; then
+		sys_bonding_path=/sys/class/net/"${IFACE}"/bonding
 		if [ -n "${primary}" ]; then
-			echo "+${primary}" >/sys/class/net/"${IFACE}"/bonding/slaves
-			echo "${primary}" >/sys/class/net/"${IFACE}"/bonding/primary
+			echo "+${primary}" >$sys_bonding_path/slaves
+			echo "${primary}" >$sys_bonding_path/primary
 		fi
 		for s in ${slaves}; do
 			[ "${s}" = "${primary}" ] && continue
-			echo "+${s}" >/sys/class/net/"${IFACE}"/bonding/slaves
+			grep -q ${s} $sys_bonding_path/slaves \
+				|| echo "+${s}" >$sys_bonding_path/slaves
 		done
 	else
 		/sbin/ifenslave "${IFACE}" ${slaves} >/dev/null

[gentoo-commits] proj/openrc:master commit in: net/

[Mike Frysinger]

commit:     2493a1f32e7ae95f0f3d3c63cb4af7abdc34959b
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 05:21:20 2011 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon May 16 05:22:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=2493a1f3

net: ccwgroup: forward port changes from baselayout-1

Quite a bit of work happened in baselayout-1 on the ccwgroup module, but
seems it didn't make it into openrc.  So forward port all the existing
code so we can work with more than just qeth and layer2 options.

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 net/ccwgroup.sh |   83 +++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 56 insertions(+), 27 deletions(-)

diff --git a/net/ccwgroup.sh b/net/ccwgroup.sh
index 6fcba1d..248b159 100644
--- a/net/ccwgroup.sh
+++ b/net/ccwgroup.sh
@@ -8,60 +8,89 @@ ccwgroup_depend()
 	before interface
 }
 
-ccwgroup_pre_start()
+ccwgroup_load_modules()
 {
-	local ccwgroup="$(_get_array "ccwgroup_${IFVAR}")"
-	[ -z "${ccwgroup}" ] && return 0
-
-	if [ ! -d /sys/bus/ccwgroup ]; then
-		modprobe qeth
-		if [ ! -d /sys/bus/ccwgroup ]; then
+	# make sure we have ccwgroup support or this is a crap shoot
+	if [ ! -d /sys/bus/ccwgroup ] ; then
+		modprobe -q ccwgroup
+		if [ ! -d /sys/bus/ccwgroup ] ; then
 			eerror "ccwgroup support missing in kernel"
 			return 1
 		fi
 	fi
 
-	einfo "Enabling ccwgroup on ${IFACE}"
-	local x= ccw= first= layer2=
-	for x in ${ccwgroup}; do
-		[ -z "${first}" ] && first=${x}
-		ccw="${ccw}${ccw:+,}${x}"
-	done
-	if [ -e /sys/devices/qeth/"${first}" ]; then
-		echo "0" >/sys/devices/qeth/"${first}"/online
+	# verify the specific interface is supported
+	if [ ! -d /sys/bus/ccwgroup/drivers/$1 ] ; then
+		modprobe $1 >& /dev/null
+		if [ ! -d /sys/bus/ccwgroup/drivers/$1 ] ; then
+			eerror "$1 support missing in kernel"
+			return 1
+		fi
+	fi
+
+	return 0
+}
+
+ccwgroup_pre_start()
+{
+	local ccwgroup="$(_get_array "ccwgroup_${IFVAR}")"
+	[ -z "${ccwgroup}" ] && return 0
+
+	local ccw_type
+	eval ccw_type=\${ccwgroup_type_${IFVAR}:-qeth}
+
+	ccwgroup_load_modules ${ccw_type} || return 1
+
+	einfo "Enabling ccwgroup/${ccw_type} on ${IFACE}"
+
+	set -- ${ccwgroup}
+	local first=$1; shift
+	if [ -e /sys/devices/${ccw_type}/${first}/online ]; then
+		echo "0" >/sys/devices/${ccw_type}/${first}/online
 	else
-		echo "${ccw}" >/sys/bus/ccwgroup/drivers/qeth/group
+		echo "${first}$(printf ',%s' "$@")" >/sys/bus/ccwgroup/drivers/${ccw_type}/group
 	fi
-	eval layer2=\$qeth_layer2_${IFVAR}
-	echo "${layer2:-0}" > /sys/devices/qeth/"${first}"/layer2
-	echo "1" >/sys/devices/qeth/"${first}"/online
+
+	local var val
+	for var in $(_get_array "ccwgroup_opts_${IFVAR}") online=1 ; do
+		val=${var#*=}
+		var=${var%%=*}
+		echo "${val}" > /sys/devices/${ccw_type}/${first}/${var}
+	done
 	eend $?
 }
 
 ccwgroup_pre_stop()
 {
+	local path="/sys/class/net/${IFACE}"
+
 	# Erase any existing ccwgroup to be safe
 	service_set_value ccwgroup_device ""
+	service_set_value ccwgroup_type ""
 
-	[ ! -L /sys/class/net/"${FACE}"/driver ] && return 0
-	local driver="$(readlink /sys/class/net/"${IFACE}"/driver)"
-	case "${diver}" in
-		*/bus/ccwgroup/*);;
+	[ ! -L "${path}"/device/driver ] && return 0
+	case "$(readlink "${path}"/device/driver)" in
+		*/bus/ccwgroup/*) ;;
 		*) return 0;;
 	esac
 
-	local device="$(readlink /sys/class/net/"${IFACE}"/device)"
+	local device
+	device="$(readlink "${path}"/device)"
 	device=${device##*/}
 	service_set_value ccwgroup_device "${device}"
+	device="$(readlink "${path}"/device/driver)"
+	device=${device##*/}
+	service_set_value ccwgroup_type "${device}"
 }
 
 ccwgroup_post_stop()
 {
 	local device="$(service_get_value ccwgroup_device)"
 	[ -z "${device}" ] && return 0
+	local ccw_type="$(service_get_value ccwgroup_type)"
 
-	einfo "Disabling ccwgroup on ${iface}"
-	echo "0" >/sys/devices/qeth/"${device}"/online
-	echo "1" >/sys/devices/qeth/"${device}"/ungroup
+	einfo "Disabling ccwgroup/${ccw_type} on ${IFACE}"
+	echo "0" >/sys/devices/${ccw_type}/"${device}"/online
+	echo "1" >/sys/devices/${ccw_type}/"${device}"/ungroup
 	eend $?
 }

[gentoo-commits] proj/openrc:master commit in: net/

[William Hubbs]

commit:     73c862b7920c7d514209d77c584829da28bdd79d
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  7 12:48:56 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Apr  7 12:48:56 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=73c862b7

fix typo in ethtool.sh

This was causing the ethtool interface to not work.

X-Gentoo-Bug: 360481
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=360481

---
 net/ethtool.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/ethtool.sh b/net/ethtool.sh
index 8ea1cde..404a3dc 100644
--- a/net/ethtool.sh
+++ b/net/ethtool.sh
@@ -37,7 +37,7 @@ ethtool_pre_start() {
 			IFS="${OIFS}"
 			local args_pretty="$(_trim "${p}")"
 			# Do nothing if empty
-			[ -z "${args_prety}" ] && continue
+			[ -z "${args_pretty}" ] && continue
 			args_pretty="--${opt} $IFACE ${args_pretty}"
 			args="--${opt} $IFACE ${args}"
 			ebegin "ethtool ${args_pretty}"

[gentoo-commits] proj/openrc:master commit in: net/

[William Hubbs]

commit:     6e1239795fcc18710398380bd32ec78aa16cd8a0
Author:     Marc Joliet <marcec <AT> gmx <DOT> de>
AuthorDate: Sun Mar 27 20:45:45 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 20:45:45 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=6e123979

remove bashism from ethtool module

X-Gentoo-Bug: 360367
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=360367

---
 net/ethtool.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/ethtool.sh b/net/ethtool.sh
index 64b44a6..8ea1cde 100644
--- a/net/ethtool.sh
+++ b/net/ethtool.sh
@@ -25,7 +25,7 @@ ethtool_pre_start() {
 	eindent
 	for opt in ${order} ; do
 		local args
-		eval args=\$ethtool_${opt//-/_}_${IFVAR}
+		eval args=\$ethtool_$(echo $opt | tr - _)_${IFVAR}
 
 		# Skip everything if no arguments
 		[ -z "${args}" ] && continue

[gentoo-commits] proj/openrc:master commit in: net/

[Mike Frysinger]

commit:     9f5eb03e5ef30f4357d05e004f38ea6ca0d21346
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 18 18:24:18 2011 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Fri Mar 18 18:24:18 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=9f5eb03e

net: bonding: avoid using bash string replace

X-Gentoo-Bug: 359311
X-Gentoo-Bug-URL: http://bugs.gentoo.org/359311
Reported-by: Raffaello D. Di Napoli <fastijum <AT> gmail.com>
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

---
 net/bonding.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/bonding.sh b/net/bonding.sh
index 209d4f0..6d15f0d 100644
--- a/net/bonding.sh
+++ b/net/bonding.sh
@@ -100,9 +100,9 @@ bonding_pre_start()
 		if [ -n "${primary}" ]; then
 			echo "+${primary}" >/sys/class/net/"${IFACE}"/bonding/slaves
 			echo "${primary}" >/sys/class/net/"${IFACE}"/bonding/primary
-			slaves="${slaves/${primary}/}"
 		fi
 		for s in ${slaves}; do
+			[ "${s}" = "${primary}" ] && continue
 			echo "+${s}" >/sys/class/net/"${IFACE}"/bonding/slaves
 		done
 	else

[gentoo-commits] proj/openrc:master commit in: net/

[Robin H. Johnson]

commit:     20480048cae39d6c3c8bb4fdb7bfc5cc842c61ca
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 21 09:53:51 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Feb 21 09:55:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=20480048

net/iproute2: Pass required explicit -6 for IPv6 tunnels (#347657)

Tunnel modes ipip6 and ip6ip6 require an explicit family selection for
the ip tunnel call.

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
X-Gentoo-Bug: 347657

---
 net/iproute2.sh |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/net/iproute2.sh b/net/iproute2.sh
index 6194faf..a2e9db7 100644
--- a/net/iproute2.sh
+++ b/net/iproute2.sh
@@ -239,9 +239,14 @@ iproute2_pre_start()
 	if [ -n "${tunnel}" ]; then
 		# Set our base metric to 1000
 		metric=1000
+		# Bug#347657: If the mode is 'ipip6' or 'ip6ip6', the -6 must be passed
+		# to iproute2 during tunnel creation.
+		local ipproto=''
+		[ "${tunnel##mode ipip6}" != "${tunnel}" ] && ipproto='-6'
+		[ "${tunnel##mode ip6ip6}" != "${tunnel}" ] && ipproto='-6'
 
 		ebegin "Creating tunnel ${IFVAR}"
-		ip tunnel add ${tunnel} name "${IFACE}"
+		ip ${ipproto} tunnel add ${tunnel} name "${IFACE}"
 		eend $? || return 1
 		_up
 	fi

[gentoo-commits] proj/openrc:master commit in: net/

[William Hubbs]

commit:     7bc920ab563411fa3c9f8223eb4679581d9678f4
Author:     Christian Wetzig <gentoo <AT> wetzig <DOT> de>
AuthorDate: Sat Feb 12 19:34:46 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Feb 12 19:34:46 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=7bc920ab

fix typo in iproute2 module

X-Gentoo-Bug: 354511
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=354511

---
 net/iproute2.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/net/iproute2.sh b/net/iproute2.sh
index 4841c10..6194faf 100644
--- a/net/iproute2.sh
+++ b/net/iproute2.sh
@@ -221,7 +221,7 @@ _ip_rule_runner() {
 	local IFS="$__IFS"
 	for ru in $rules ; do
 		unset IFS
-		ruN="$(trim "${ru}")"
+		ruN="$(_trim "${ru}")"
 		[ -z "${ruN}" ] && continue
 		vebegin "${cmd} ${ruN}"
 		ip rule ${cmd} ${ru}

[gentoo-commits] proj/openrc:master commit in: net/

[William Hubbs]

commit:     43678fd2c44ec35acdcf0316c8ff3b07ee1e5f57
Author:     Christian <christian <AT> ch-sc <DOT> de>
AuthorDate: Sat Feb  5 13:24:11 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sat Feb  5 13:24:11 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=43678fd2

bridge.sh: use correct POSIX test, = not ==

X-Gentoo-Bug: 353124
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=353124

---
 net/bridge.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/bridge.sh b/net/bridge.sh
index 234a640..91e68d6 100644
--- a/net/bridge.sh
+++ b/net/bridge.sh
@@ -45,8 +45,8 @@ bridge_pre_start()
 	eval bridge_unset=\${bridge_${IFVAR}-y\}
 	eval brctl_unset=\${brctl_${IFVAR}-y\}
 
-	if [ -z "${brif}" -a "${brctl_unset}" == 'y' ]; then
-		if [ -z "${ports}" -a "${bridge_unset}" == "y" ]; then
+	if [ -z "${brif}" -a "${brctl_unset}" = 'y' ]; then
+		if [ -z "${ports}" -a "${bridge_unset}" = "y" ]; then
 			#eerror "Misconfigured static bridge detected (see net.example)"
 			return 0
 		fi