# HG changeset patch
# User igor
# Date 1189755374 -10800
# Node ID 1ede117a35ecc93ad1c2834be4ce13109ceb3048
# Parent  f7fa09a390ed1b363296bdf99c48704d25f09f66
mini changes

diff -r f7fa09a390ed -r 1ede117a35ec build-xenomips-image
--- a/build-xenomips-image	Thu Aug 30 14:45:50 2007 +0300
+++ b/build-xenomips-image	Fri Sep 14 10:36:14 2007 +0300
@@ -66,6 +66,9 @@
 apt-get -y --force-yes install ${PACKAGES}
 /etc/init.d/ssh stop
 cat <<FSTAB > /etc/fstab
+proc            /proc           proc            defaults                0       0
+tmpfs           /tmp            tmpfs           defaults,nosuid,nodev   0       0
+
 /dev/hda1       /                       ext3    ro              0       0
 /dev/hda2       /xenomips/ios           ext3    ro              0       0
 /dev/hda3       /xenomips/config        ext3    rw              0       0
@@ -97,7 +100,10 @@
 PROFILE
 SCRIPT
 
-cp -R /lib/modules/${KERNEL_VERSION} ${WORK_DIR}/lib/modules
+for kernel_version in ${KERNEL_VERSION} 2.6.18-without-PAE-4-xen-686
+do
+    cp -R /lib/modules/${KERNEL_VERSION} ${WORK_DIR}/lib/modules
+done
 
 cp ${XENOMIPS_DIR}/xenomips-init ${WORK_DIR}/etc/init.d/
 cp ${XENOMIPS_DIR}/xenomips.sh ${WORK_DIR}/usr/local/bin
@@ -109,6 +115,8 @@
 build_and_install_dynamips
 
 mv ${WORK_DIR}/etc/quagga.ORIG ${WORK_DIR2}/quagga
+perl -i -p -e 's/=no/=yes/' ${WORK_DIR2}/quagga/daemons
+touch ${WORK_DIR2}/quagga/{zebra,bgpd,ospfd,ripd,ripngd,ospf6d,isisd}.conf
 umount ${WORK_DIR}
 
 if  echo $CONFIG_FS_BUILD | grep -qi ^y
diff -r f7fa09a390ed -r 1ede117a35ec xentaur.py
--- a/xentaur.py	Thu Aug 30 14:45:50 2007 +0300
+++ b/xentaur.py	Fri Sep 14 10:36:14 2007 +0300
@@ -5,7 +5,10 @@
 import xenomips_vars
 xenomips_vars.N='1'
 sys.path.append('/etc/xen')
-from xenomipsN import bridges,vbridges_table, hidden_bridges, domains, broken_links, temporary_links, domain_types
+
+xen_config_name='fabergeN'
+from fabergeN import bridges,vbridges_table, hidden_bridges, domains, broken_links, temporary_links, domain_types
+
 from IPython.Shell import IPShellEmbed
 
 
@@ -35,7 +38,7 @@
 
 def create_domains_script():
     for N in range(len(domains)):
-        print "sudo /usr/sbin/xm create xenomipsN N="+str(N)+" && sleep 1 && sudo /usr/sbin/xm sched-credit -d $(sudo /usr/sbin/xm list | grep "+domains[N]+" | awk '{print $2}') -c 10 && sleep 1"
+        print "sudo /usr/sbin/xm create "+xen_config_name+" N="+str(N)+" && sleep 1 && sudo /usr/sbin/xm sched-credit -d $(sudo /usr/sbin/xm list | grep "+domains[N]+" | awk '{print $2}') -c 10 && sleep 1"
 
 def destroy_domains_script():
     for N in range(len(domains)):
@@ -46,15 +49,19 @@
     N=1
     screens=[]
     for domain in domains:
-        screens.append("screen -t "+domain+"   "+str(N)+" xm console "+domain)
-#        ip="192.168.80."+str(200+N)
-#        screens.append("screen -t "+domain+"   "+str(N)+" sh -c 'while true; do ssh root@"+ip+" ; done'")
+        screens.append("screen -t "+domain+" "+str(N)+" sh -c 'while true; do sudo xm console "+domain+" ; echo Retrying in 5 seconds...; sleep 5; done'")
         N+=1
     screenlist="\n".join(screens)
 
+#
+# Previous terminal acccess commands:
+#        ip="192.168.80."+str(200+N)
+#        screens.append("screen -t "+domain+"   "+str(N)+" sh -c 'while true; do ssh root@"+ip+" ; done'")
+#
+
 #hardstatus string "\%{gk}\%c \%{yk}\%M\%d \%{wk}\%?\%-Lw\%?\%{bw}\%n*\%f\%t\%?(\%u)\%?\%{wk}\%?\%+Lw\%?"
    
-    f=open("screenrc", "w");
+    f=open(screenrc, "w");
     f.write("""
 hardstatus on
 hardstatus alwayslastline