# HG changeset patch
# User igor
# Date 1186076769 -10800
# Node ID 825cd93472deea9186707b444e3ce8fd8acb70bb
# Parent  e4d8da085a2eceed499773cb25b7094b18aae613
Dodelal

diff -r e4d8da085a2e -r 825cd93472de build-xenomips-image
--- a/build-xenomips-image	Sun Jul 15 14:37:16 2007 +0300
+++ b/build-xenomips-image	Thu Aug 02 20:46:09 2007 +0300
@@ -2,24 +2,23 @@
 
 DYNAMIPS_BUILD=yes
 XENOMIPS_FS_BUILD=yes
-CONFIG_FS_BUILD=no
+CONFIG_FS_BUILD=yes
 IOS_FS_BUILD=yes
 
+XENOMIPS_DIR="files/"
+XENOMIPS_IMAGES_DIR="../images/"
+
 #Xenomips FS
 XENOMIPS_FS_SIZE=2048k                  # size in 1k blocks
-XENOMIPS_FS_NAME=xenomips1.img
+XENOMIPS_FS_NAME=${XENOMIPS_IMAGES_DIR}/xenomips1.img
 
 # Config FS
-CONFIG_FS_SIZE=100k
-CONFIG_FS_NAME=xenomips-config1.img
+CONFIG_FS_SIZE=1000k
+CONFIG_FS_NAME=${XENOMIPS_IMAGES_DIR}/xenomips-config1.img
 
 # IOS FS
 IOS_FS_SIZE=2048k
-IOS_FS_NAME=xenomips-ios1.img
-
-
-XENOMIPS_DIR="files/"
-
+IOS_FS_NAME=${XENOMIPS_IMAGES_DIR}/xenomips-ios1.img
 
 DEBIAN_MIRROR=http://debian.org.ua/debian
 DISTRO=sid
@@ -32,6 +31,7 @@
 IOS_DIR="ios/"
 
 WORK_DIR=${XENOMIPS_FS_NAME%%.img}
+WORK_DIR2=/tmp/xenomips-build
 
 build_and_install_dynamips()
 {
@@ -58,7 +58,7 @@
 
 dd if=/dev/zero of=${XENOMIPS_FS_NAME} count=${XENOMIPS_FS_SIZE} bs=1024
 mkfs.ext3 -F ${XENOMIPS_FS_NAME}
-mkdir -p ${WORK_DIR}
+mkdir -p ${WORK_DIR} ${WORK_DIR2}
 mount -o loop ${XENOMIPS_FS_NAME} ${WORK_DIR}
 debootstrap  ${DISTRO} ${WORK_DIR} ${DEBIAN_MIRROR} 
 cat <<SCRIPT | chroot ${WORK_DIR} sh -s
@@ -85,11 +85,16 @@
 cd /etc/rcS.d; ln -s ../init.d/xenomips-init S35xenomips-init
 rm /etc/rc2.d/S*quagga
 
-perl -i -p -e s@C_PATH=/etc/quagga@C_PATH=/xenomips/etc/quagga@ /etc/init.d/quagga
+#perl -i -p -e s@C_PATH=/etc/quagga@C_PATH=/xenomips/etc/quagga@ /etc/init.d/quagga
+mv /etc/quagga /etc/quagga.ORIG
+ln -s /xenomips/config/etc/quagga /etc/quagga
 
-mkdir -p /xenomips/{ios,config,dynamips,etc/quagga} /var/lib/xenomips /root/.ssh
+mkdir -p /xenomips/{ios,config,dynamips} /var/lib/xenomips /root/.ssh
 
+cat <<PROFILE >> /root/.profile
+TERM=linux
 screen -ls | grep -q Attached && screen -x || screen -ls | grep -q Detached && screen -r
+PROFILE
 SCRIPT
 
 cp -R /lib/modules/${KERNEL_VERSION} ${WORK_DIR}/lib/modules
@@ -103,6 +108,7 @@
 
 build_and_install_dynamips
 
+mv ${WORK_DIR}/etc/quagga ${WORK_DIR2}
 umount ${WORK_DIR}
 
 if  echo $CONFIG_FS_BUILD | grep -qi ^y
@@ -111,6 +117,9 @@
     mkfs.ext3 -F ${CONFIG_FS_NAME}
 fi
 
+mount -o loop ${CONFIG_FS_NAME} ${WORK_DIR}
+mkdir -p ${WORK_DIR}/etc
+mv ${WORK_DIR2}/quagga ${WORK_DIR}/etc
 
 if echo $IOS_FS_BUILD | grep -qi ^y
 then
diff -r e4d8da085a2e -r 825cd93472de files/xenomips.sh
--- a/files/xenomips.sh	Sun Jul 15 14:37:16 2007 +0300
+++ b/files/xenomips.sh	Thu Aug 02 20:46:09 2007 +0300
@@ -1,9 +1,13 @@
 #!/bin/sh
 
-DYNAMIPS_WORKDIR="/xenomips/config"
-DYNAMIPS_ARGS=`cat /proc/cmdline | sed 's/.*xenomips="//; s/".*//'`
+if grep -qi xenomips /proc/cmdline
+then 
+    DYNAMIPS_WORKDIR="/xenomips/config"
+    DYNAMIPS_ARGS=`cat /proc/cmdline | sed 's/.*xenomips="//; s/".*//'`
+    cd "$DYNAMIPS_WORKDIR"
+    screen -e '^xx' -d -m dynamips $DYNAMIPS_ARGS
+else
+    /etc/init.d/quagga start
+    screen -e '^xx' -d -m vtysh
+fi
 
-
-cd "$DYNAMIPS_WORKDIR"
-screen -e '^``' -d -m dynamips $DYNAMIPS_ARGS
-
diff -r e4d8da085a2e -r 825cd93472de xentaur.py
--- a/xentaur.py	Sun Jul 15 14:37:16 2007 +0300
+++ b/xentaur.py	Thu Aug 02 20:46:09 2007 +0300
@@ -32,11 +32,12 @@
 
 def create_screens_script():
 
-    N=0
+    N=1
     screens=[]
     for domain in domains:
-        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)+" 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'")
         N+=1
     screenlist="\n".join(screens)