# HG changeset patch
# User igor
# Date 1193218312 -10800
# Node ID 8c00f233a1d4dba7b93033fab1adbaeee890c9f5
# Parent  10444acb35f4fec328f6d45e30e24f2bbad85296
removed full pathes from execs inside xentaur.py

diff -r 10444acb35f4 -r 8c00f233a1d4 build-xenomips-image
--- a/build-xenomips-image	Fri Oct 12 17:31:34 2007 +0300
+++ b/build-xenomips-image	Wed Oct 24 12:31:52 2007 +0300
@@ -2,7 +2,7 @@
 
 DYNAMIPS_BUILD=no
 XENOMIPS_FS_BUILD=yes
-CONFIG_FS_BUILD=no
+CONFIG_FS_BUILD=yes
 IOS_FS_BUILD=yes
 
 XENOMIPS_DIR="files/"
@@ -25,7 +25,7 @@
 
 DEBIAN_MIRROR=http://debian.osdn.org.ua/debian
 DISTRO=sid
-PACKAGES="openssh-server libc6-xen libelf1 libpcap0.8 screen nfs-common quagga tcpdump"
+PACKAGES="openssh-server libc6-xen libelf1 libpcap0.8 screen nfs-common quagga tcpdump telnet ntpdate hping3 openntpd"
 DYNAMIPS_SOURCES=http://www.ipflow.utc.fr/dynamips/dynamips-0.2.7.tar.gz
 DYNAMIPS_BUILD_DIR=dynamips/
 KERNEL_VERSION=`uname -r`
@@ -134,7 +134,7 @@
 if  echo $CONFIG_FS_BUILD | grep -qi ^y
 then
     myecho Preparing the Xenomips config filesystem
-    dd if=/dev/zero of=${CONFIG_FS_NAME} bs=1k count=${CONFIG_FS_SIZE}
+    dd if=/dev/zero of=${CONFIG_FS_NAME} bs=1k count=1 seek=${CONFIG_FS_SIZE} 
     mkfs.ext3 -F ${CONFIG_FS_NAME}
 
     mount -o loop ${CONFIG_FS_NAME} ${WORK_DIR}
diff -r 10444acb35f4 -r 8c00f233a1d4 xentaur.py
--- a/xentaur.py	Fri Oct 12 17:31:34 2007 +0300
+++ b/xentaur.py	Wed Oct 24 12:31:52 2007 +0300
@@ -8,7 +8,7 @@
 sys.path.append('/etc/xen')
 sys.path.append(xentaur_path)
 
-network='snrs_ipsec_preshared_1'
+network='snrs_ipsec_rsa_1'
 domain='qua1'
 from xendomain import *
 
@@ -38,8 +38,9 @@
 
 def create_bridges_script():
     unbound_bridges=set(bridges)-set(real_bridges)
-    create_unbound_bridges="\n".join(map(lambda x: "sudo /usr/sbin/brctl show | awk '{print $1}' | grep -qx "+x+" || sudo /usr/sbin/brctl addbr "+x, unbound_bridges))
-    create_unbound_bridges+="\n"+"\n".join(map(lambda x: "sudo /bin/ip link set "+x+" up", unbound_bridges))
+    create_unbound_bridges="\n".join(map(lambda x: "sudo brctl show | awk '{print $1}' | grep -qx "+x+" || sudo brctl addbr "+x, unbound_bridges))
+    create_unbound_bridges+="\n"+"\n".join(map(lambda x: "sudo brctl stp "+x+" off", unbound_bridges))
+    create_unbound_bridges+="\n"+"\n".join(map(lambda x: "sudo ip link set "+x+" up", unbound_bridges))
 
     print """#!/bin/sh
 # create unbound bridges
@@ -50,12 +51,12 @@
 def create_domains_script():
     for domain in domains:
         if not domain in real_nodes:
-            print "sudo /usr/sbin/xm create "+xentaur_path+"/xendomain.py "+" domain="+domain+" network="+network+" && sleep 1 && sudo /usr/sbin/xm sched-credit -d $(sudo /usr/sbin/xm list | grep "+domain+" | awk '{print $2}') -c 10 && sleep 1"
+            print "sudo xm create "+xentaur_path+"/xendomain.py "+" domain="+domain+" network="+network+" && sleep 1 && sudo xm sched-credit -d $(sudo xm list | grep "+domain+" | awk '{print $2}') -c 10 && sleep 1"
 
 def destroy_domains_script():
     for domain in domains:
         if not domain in real_nodes:
-            print "sudo /usr/sbin/xm shutdown "+domain
+            print "sudo xm shutdown "+domain
 
 def create_screens_script():
     N=1