tools: Fix network-bridge to work with Gentoo

JM> This patch fixes domU networking in Gentoo. The change to JM> ifup/ifdown (which isn't availabe in Gentoo) prevents the bridge JM> from being setup correctly. The patch below checks if ifup is JM> avaiable, and if not starts the Gentoo networking scripts.

This brings up the idea about how we can be as distro-friendly as possible when it comes to network configuration.

How about if we replace the distro-specific bits of the network-bridge script with calls out to a dedicated one, after we determine which distro we're on? That way, we can cleanly add support for a new distro, without adding a bunch of if-then-elsif's to the main script.

Also, it would allow the distros to easily maintain and plug in their own scripts to integrate with their network configuration utilities. That way, they wouldn't have to maintain a patch to the monolithic xen script. They could just drop their module into, say, /etc/xen/scripts/distros/redhat.sh, or something similar.

I think that if we were to make a standard function interface (like LSB) that the scripts implement, then we could just source them and use their functions to carry out the wishes of the more complex logic in the master network-bridge script.

Thoughts?

This patch fixes domU networking in Gentoo. The change to ifup/ifdown (which isn't availabe in Gentoo) prevents the bridge from being setup correctly. The patch below checks if ifup is avaiable, and if not starts the Gentoo networking scripts.

Signed-off-by Jon Mason <[email protected]>

# HG changeset patch
# User root@pentium4
# Node ID 07ba15ba986268ff869d7d2253eab8eed3edbe8b # Parent f529cd119470032c2bc70b21432e733f9605727b Fix network-bridge to work with Gentoo

diff -r f529cd119470 -r 07ba15ba9862 tools/examples/network-bridge

tools/examples/network-bridge +0 -0

@@ -177,7 +177,12 @@
 
     if ifconfig veth0 2>/dev/null | grep -q veth0 ; then
 	mac=`ifconfig ${netdev} | grep HWadd | sed -e

's/.*\(..:..:..:..:..:..\).*/\1/'` - if ! ifdown ${netdev} ; then

This patch fixes domU networking in Gentoo. The change to ifup/ifdown (which isn't availabe in Gentoo) prevents the bridge from being setup correctly. The patch below checks if ifup is avaiable, and if not starts the Gentoo networking scripts.

This new version includes shell functions where distro specific options may be handled (per Ian's suggestion).

Signed-off-by Jon Mason <[email protected]>

# HG changeset patch
# User root@pentium4
# Node ID 6de75791e5a54b8eb093c6630efb68f896c16fa3 # Parent 00037ba13f0bb8efe4b2c3efe40200eac21c68dd

Fix network-bridge to work with Gentoo

diff -r 00037ba13f0b -r 6de75791e5a5 tools/examples/network-bridge

tools/examples/network-bridge +0 -0

@@ -54,6 +54,32 @@
 antispoof=${antispoof:-no}
 

echo "*network $OP bridge=$bridge netdev=$netdev antispoof=$antispoof" >&2

tools/examples/network-bridge +26 -0

+
+# Usage: eth_down interface
+eth_down() {
+	local rc
+	local eth=$1
+	ifdown=$(which ifdown 2>/dev/null)
+	if [ -n "$ifdown" ]; then
+		$ifdown ${eth}; rc=$?
+	else
+		/etc/init.d/net.${eth} stop; rc=$?
+	fi
+	return $rc
+}
+
+# Usage: eth_up interface
+eth_up() {
+	local rc
+	local eth=$1
+	ifdown=$(which ifup 2>/dev/null)
+	if [ -n "$ifup" ]; then
+		$ifup ${eth}; rc=$?
+	else
+		/etc/init.d/net.${eth} start; rc=$?
+	fi
+	return $rc
+}

# Usage: transfer_addrs src dst
# Copy all IP addresses (including aliases) from device $src to device $dst.

tools/examples/network-bridge +3 -3

@@ -177,7 +203,7 @@
 
    if ifconfig veth0 2>/dev/null | grep -q veth0 ; then
 	mac=`ifconfig ${netdev} | grep HWadd | sed -e 's/.*\(..:..:..:..:..:..\).*/\1/'`
-	if ! ifdown ${netdev} ; then
+	if ! eth_down ${netdev} ; then
 		# if ifup didn't work, see if we have an ip= on cmd line
 		if egrep 'ip=[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+:' /proc/cmdline ; 
 		then

@@ -197,7 +223,7 @@
 	ip link set ${bridge} up
 	ip link set vif0.0 up
 	ip link set p${netdev} up
-	if ! ifup ${netdev} ; then
+	if ! eth_up ${netdev} ; then
 		if [ ${kip} ] ; then
 			# use the addresses we grocked from /proc/cmdline	
 			ifconfig ${netdev} ${kip} 

@@ -238,7 +264,7 @@
        ip link set peth0 name eth0
        ifconfig ${bridge} down
        brctl delbr ${bridge}
-        ifup eth0
+        eth_up eth0
 
    else
        transfer_routes ${bridge} ${netdev}

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

This patch fixes domU networking in Gentoo. The change to ifup/ifdown (which isn't availabe in Gentoo) prevents the bridge from being setup correctly. The patch below checks if ifup is avaiable, and if not starts the Gentoo networking scripts.

This new version includes shell functions where distro specific options may be handled (per Ian's suggestion).