# HG changeset patch
# User root@linux10
# Date 1223663748 0
# Node ID d3198c10cc100c43faa0f1aac11bdf93583768c7
# Parent  151c7ef48ded9824977b5917a921c3cf09290c30
minifix

diff -r 151c7ef48ded -r d3198c10cc10 INSTALL
--- a/INSTALL	Wed Oct 01 00:39:01 2008 +0300
+++ b/INSTALL	Fri Oct 10 18:35:48 2008 +0000
@@ -20,6 +20,7 @@
 chmod +x ${ROOT}/etc/init.d/xen-drbd
 
 cp xen-scripts-network-xen-drbd $ROOT/etc/xen/scripts/network-xen-drbd
+cp network-bridge-for-xen-drbd $ROOT/etc/xen/scripts/network-bridge-for-xen-drbd
 chmod +x /etc/xen/scripts/network-xen-drbd
 
 cp default-xen-drbd ${ROOT}/etc/default/xen-drbd
diff -r 151c7ef48ded -r d3198c10cc10 network-bridge-for-xen-drbd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/network-bridge-for-xen-drbd	Fri Oct 10 18:35:48 2008 +0000
@@ -0,0 +1,313 @@
+#!/bin/bash
+#============================================================================
+# Default Xen network start/stop script.
+# Xend calls a network script when it starts.
+# The script name to use is defined in /etc/xen/xend-config.sxp
+# in the network-script field.
+#
+# This script creates a bridge (default xenbr${vifnum}), adds a device
+# (default eth${vifnum}) to it, copies the IP addresses from the device
+# to the bridge and adjusts the routes accordingly.
+#
+# If all goes well, this should ensure that networking stays up.
+# However, some configurations are upset by this, especially
+# NFS roots. If the bridged setup does not meet your needs,
+# configure a different script, for example using routing instead.
+#
+# Usage:
+#
+# network-bridge (start|stop|status) {VAR=VAL}*
+#
+# Vars:
+#
+# vifnum     Virtual device number to use (default 0). Numbers >=8
+#            require the netback driver to have nloopbacks set to a
+#            higher value than its default of 8.
+# bridge     The bridge to use (default xenbr${vifnum}).
+# netdev     The interface to add to the bridge (default eth${vifnum}).
+# antispoof  Whether to use iptables to prevent spoofing (default no).
+#
+# Internal Vars:
+# pdev="p${netdev}"
+# vdev="veth${vifnum}"
+# vif0="vif0.${vifnum}"
+#
+# start:
+# Creates the bridge
+# Copies the IP and MAC addresses from netdev to vdev
+# Renames netdev to be pdev 
+# Renames vdev to be netdev 
+# Enslaves pdev, vdev to bridge
+#
+# stop:
+# Removes netdev from the bridge
+# Transfers addresses, routes from netdev to pdev
+# Renames netdev to vdev
+# Renames pdev to netdev 
+# Deletes bridge
+#
+# status:
+# Print addresses, interfaces, routes
+#
+#============================================================================
+
+
+dir=$(dirname "$0")
+. "$dir/xen-script-common.sh"
+. "$dir/xen-network-common.sh"
+
+findCommand "$@"
+evalVariables "$@"
+
+modprobe netloop > /dev/null 2>&1 || true
+
+vifnum=${vifnum:-$(ip route list | awk '/^default / { print $NF }' | sed 's/^[^0-9]*//')}
+vifnum=${vifnum:-0}
+bridge=${bridge:-xenbr${vifnum}}
+netdev=${netdev:-eth${vifnum}}
+antispoof=${antispoof:-no}
+
+pdev="p${netdev}"
+vdev="veth${vifnum}"
+vif0="vif0.${vifnum}"
+
+get_ip_info() {
+    addr_pfx=`ip addr show dev $1 | egrep '^ *inet' | sed -e 's/ *inet //' -e 's/ .*//'`
+    gateway=`ip route show dev $1 | fgrep default | sed 's/default via //'`
+}
+    
+do_ifup() {
+    if ! ifup $1 ; then
+        if [ ${addr_pfx} ] ; then
+            # use the info from get_ip_info()
+            ip addr flush $1
+            ip addr add ${addr_pfx} dev $1
+            ip link set dev $1 up
+            [ ${gateway} ] && ip route add default via ${gateway}
+        fi
+    fi
+}
+
+# Usage: transfer_addrs src dst
+# Copy all IP addresses (including aliases) from device $src to device $dst.
+transfer_addrs () {
+    local src=$1
+    local dst=$2
+    # Don't bother if $dst already has IP addresses.
+    if ip addr show dev ${dst} | egrep -q '^ *inet ' ; then
+        return
+    fi
+    # Address lines start with 'inet' and have the device in them.
+    # Replace 'inet' with 'ip addr add' and change the device name $src
+    # to 'dev $src'.
+    ip addr show dev ${src} | egrep '^ *inet ' | sed -e "
+s/inet/ip addr add/
+s@\([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+/[0-9]\+\)@\1@
+s/${src}/dev ${dst}/
+" | sh -e
+    # Remove automatic routes on destination device
+    ip route list | sed -ne "
+/dev ${dst}\( \|$\)/ {
+  s/^/ip route del /
+  p
+}" | sh -e
+}
+
+# Usage: transfer_routes src dst
+# Get all IP routes to device $src, delete them, and
+# add the same routes to device $dst.
+# The original routes have to be deleted, otherwise adding them
+# for $dst fails (duplicate routes).
+transfer_routes () {
+    local src=$1
+    local dst=$2
+    # List all routes and grep the ones with $src in.
+    # Stick 'ip route del' on the front to delete.
+    # Change $src to $dst and use 'ip route add' to add.
+    ip route list | sed -ne "
+/dev ${src}\( \|$\)/ {
+  h
+  s/^/ip route del /
+  P
+  g
+  s/${src}/${dst}/
+  s/^/ip route add /
+  P
+  d
+}" | sh -e
+}
+
+
+##
+# link_exists interface
+#
+# Returns 0 if the interface named exists (whether up or down), 1 otherwise.
+#
+link_exists()
+{
+    if ip link show "$1" >/dev/null 2>/dev/null
+    then
+        return 0
+    else
+        return 1
+    fi
+}
+
+# Set the default forwarding policy for $dev to drop.
+# Allow forwarding to the bridge.
+antispoofing () {
+    iptables -P FORWARD DROP
+    iptables -F FORWARD
+    iptables -A FORWARD -m physdev --physdev-in ${pdev} -j ACCEPT
+    iptables -A FORWARD -m physdev --physdev-in ${vif0} -j ACCEPT
+}
+
+# Usage: show_status dev bridge
+# Print ifconfig and routes.
+show_status () {
+    local dev=$1
+    local bridge=$2
+    
+    echo '============================================================'
+    ip addr show ${dev}
+    ip addr show ${bridge}
+    echo ' '
+    brctl show ${bridge}
+    echo ' '
+    ip route list
+    echo ' '
+    route -n
+    echo '============================================================'
+}
+
+op_start () {
+    if [ "${bridge}" = "null" ] ; then
+	return
+    fi
+
+    if ! link_exists "$vdev"; then
+        if link_exists "$pdev"; then
+            # The device is already up.
+            return
+        else
+            echo "
+Link $vdev is missing.
+This may be because you have reached the limit of the number of interfaces
+that the loopback driver supports.  If the loopback driver is a module, you
+may raise this limit by passing it as a parameter (nloopbacks=<N>); if the
+driver is compiled statically into the kernel, then you may set the parameter
+using loopback.nloopbacks=<N> on the domain 0 kernel command line.
+" >&2
+            exit 1
+        fi
+    fi
+
+    create_bridge ${bridge}
+
+    if link_exists "$vdev"; then
+	mac=`ip link show ${netdev} | grep 'link\/ether' | sed -e 's/.*ether \(..:..:..:..:..:..\).*/\1/'`
+	preiftransfer ${netdev}
+	transfer_addrs ${netdev} ${vdev}
+	if ! ifdown ${netdev}; then
+	    # If ifdown fails, remember the IP details.
+	    get_ip_info ${netdev}
+	    ip link set ${netdev} down
+	    ip addr flush ${netdev}
+	fi
+	ip link set ${netdev} name ${pdev}
+	ip link set ${vdev} name ${netdev}
+
+	setup_bridge_port ${pdev}
+	setup_bridge_port ${vif0}
+	ip link set ${netdev} addr ${mac} arp on
+
+	ip link set ${bridge} up
+	add_to_bridge  ${bridge} ${vif0}
+	add_to_bridge2 ${bridge} ${pdev}
+	do_ifup ${netdev}
+    else
+	# old style without ${vdev}
+	transfer_addrs  ${netdev} ${bridge}
+	transfer_routes ${netdev} ${bridge}
+    fi
+
+    if [ ${antispoof} = 'yes' ] ; then
+	antispoofing
+    fi
+}
+
+op_stop () {
+    if [ "${bridge}" = "null" ]; then
+	return
+    fi
+    if ! link_exists "$bridge"; then
+	return
+    fi
+
+    if link_exists "$pdev"; then
+	ip link set dev ${vif0} down
+	mac=`ip link show ${netdev} | grep 'link\/ether' | sed -e 's/.*ether \(..:..:..:..:..:..\).*/\1/'`
+	transfer_addrs ${netdev} ${pdev}
+	if ! ifdown ${netdev}; then
+	    get_ip_info ${netdev}
+	fi
+	ip link set ${netdev} down arp off
+	ip link set ${netdev} addr fe:ff:ff:ff:ff:ff
+	ip link set ${pdev} down
+	ip addr flush ${netdev}
+	ip link set ${pdev} addr ${mac} arp on
+
+	brctl delif ${bridge} ${pdev}
+	brctl delif ${bridge} ${vif0}
+	ip link set ${bridge} down
+
+	ip link set ${netdev} name ${vdev}
+	ip link set ${pdev} name ${netdev}
+	do_ifup ${netdev}
+    else
+	transfer_routes ${bridge} ${netdev}
+	ip link set ${bridge} down
+    fi
+    brctl delbr ${bridge}
+}
+
+# adds $dev to $bridge but waits for $dev to be in running state first
+add_to_bridge2() {
+    local bridge=$1
+    local dev=$2
+    local maxtries=10
+
+    echo -n "Waiting for ${dev} to negotiate link."
+    ip link set ${dev} up
+    for i in `seq ${maxtries}` ; do
+	if ifconfig ${dev} | grep -q RUNNING ; then
+	    break
+	else
+	    echo -n '.'
+	    sleep 1
+	fi
+    done
+
+    if [ ${i} -eq ${maxtries} ] ; then echo '(link isnt in running state)' ; fi
+
+    add_to_bridge ${bridge} ${dev}
+}
+
+case "$command" in
+    start)
+	op_start
+	;;
+    
+    stop)
+	op_stop
+	;;
+
+    status)
+	show_status ${netdev} ${bridge}
+	;;
+
+    *)
+	echo "Unknown command: $command" >&2
+	echo 'Valid commands are: start, stop, status' >&2
+	exit 1
+esac
diff -r 151c7ef48ded -r d3198c10cc10 xen-drbd-install.py
--- a/xen-drbd-install.py	Wed Oct 01 00:39:01 2008 +0300
+++ b/xen-drbd-install.py	Fri Oct 10 18:35:48 2008 +0000
@@ -161,7 +161,7 @@
     print "drbdadm up all"
     for dom in domains:
         for disk in disk_table[dom]:
-            print "drbdsetup %s primary -o" % disk.split(':')[0]
+            print "drbdsetup /dev/%s primary -o" % disk.split(':')[0]
 
 
 def make_links():
@@ -271,8 +271,8 @@
     network %s.0
     broadcast %s.255
     gateway %s
+    dns-search %s
     dns-nameservers %s
-    dns-search %s
 INTERFACES
         """ % (dom,ip_address_table[dom],ip_network, ip_network, ip_gateway, domain_name, ip_nameserver)