# HG changeset patch
# User igor
# Date 1193225408 -10800
# Node ID 61476759b5f1e9874d7c8e4004b7cea7b6670ab6
# Parent  e006fac33f0563fb9474df2596657fef1ad3b132
build fixes

diff -r e006fac33f05 -r 61476759b5f1 build-xenomips-image
--- a/build-xenomips-image	Wed Oct 24 13:27:53 2007 +0300
+++ b/build-xenomips-image	Wed Oct 24 14:30:08 2007 +0300
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 DYNAMIPS_BUILD=no
-XENOMIPS_FS_BUILD=yes
+XENOMIPS_FS_BUILD=no
 CONFIG_FS_BUILD=yes
-IOS_FS_BUILD=yes
+IOS_FS_BUILD=no
 
 XENOMIPS_DIR="files/"
 XENOMIPS_IMAGES_DIR="/xen/images/"
@@ -17,7 +17,7 @@
 # Config FS
 CONFIG_FS_SIZE=1000k
 CONFIG_FS_NAME=${XENOMIPS_IMAGES_DIR}/xenomips-configXXX.img  # XXX will be automagically substitued with 
-CONFIG_FS_NUMBER=5                                            # the number of the Xenomips instance
+CONFIG_FS_NUMBER=10                                           # the number of the Xenomips instance
 
 # IOS FS
 IOS_FS_SIZE=2048k
@@ -63,13 +63,23 @@
     cd ${OLD_PWD}
 }
 
-myecho Preparing the Xenomips filesystem
-dd if=/dev/zero of=${XENOMIPS_FS_NAME} seek=${XENOMIPS_FS_SIZE} bs=1024 count=1
-mkfs.ext3 -F ${XENOMIPS_FS_NAME}
-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
+if [ $(id -u) != 0 ]
+then
+    echo You are not root.
+    echo Please, log in as root or run the script with sudo
+    ecit 1
+fi
+
+
+if  echo $XENOMIPS_FS_BUILD | grep -qi ^y
+then
+    myecho Preparing the Xenomips filesystem
+    dd if=/dev/zero of=${XENOMIPS_FS_NAME} seek=${XENOMIPS_FS_SIZE} bs=1024 count=1
+    mkfs.ext3 -F ${XENOMIPS_FS_NAME}
+    mkdir -p ${WORK_DIR}
+    mount -o loop ${XENOMIPS_FS_NAME} ${WORK_DIR}
+    debootstrap  ${DISTRO} ${WORK_DIR} ${DEBIAN_MIRROR} 
+    cat <<SCRIPT | chroot ${WORK_DIR} sh -s
 unset LANG
 apt-get -y --force-yes install ${PACKAGES}
 /etc/init.d/ssh stop
@@ -112,27 +122,33 @@
 PROFILE
 SCRIPT
 
-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
+    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
-sudo chmod +x  ${WORK_DIR}/usr/local/bin/xenomips.sh ${WORK_DIR}/etc/init.d/xenomips-init
+    cp ${XENOMIPS_DIR}/xenomips-init ${WORK_DIR}/etc/init.d/
+    cp ${XENOMIPS_DIR}/xenomips.sh ${WORK_DIR}/usr/local/bin
+    sudo chmod +x  ${WORK_DIR}/usr/local/bin/xenomips.sh ${WORK_DIR}/etc/init.d/xenomips-init
 
-cat ${SSH_OPEN_KEY} > ${WORK_DIR}/root/.ssh/authorized_keys
-chmod 600  ${WORK_DIR}/root/.ssh/authorized_keys
+    cat ${SSH_OPEN_KEY} > ${WORK_DIR}/root/.ssh/authorized_keys
+    chmod 600  ${WORK_DIR}/root/.ssh/authorized_keys
 
-build_and_install_dynamips
+    build_and_install_dynamips
+    umount ${WORK_DIR}
+fi
 
-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
 then
+    mkdir -p ${WORK_DIR}
+    mount -o loop ${XENOMIPS_FS_NAME} ${WORK_DIR}
+    mkdir -p ${WORK_DIR2}
+    cp -a ${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}
+
     myecho Preparing the Xenomips config filesystem
     dd if=/dev/zero of=${CONFIG_FS_NAME} bs=1k count=1 seek=${CONFIG_FS_SIZE} 
     mkfs.ext3 -F ${CONFIG_FS_NAME}
diff -r e006fac33f05 -r 61476759b5f1 files/xenomips-init
--- a/files/xenomips-init	Wed Oct 24 13:27:53 2007 +0300
+++ b/files/xenomips-init	Wed Oct 24 14:30:08 2007 +0300
@@ -42,6 +42,17 @@
   touch /var/log/dmesg
 }
 
+unbind_mounts() {
+# FIXME
+    true
+}
 
-bind_mounts
+case $1 in
+    start)
+        bind_mounts
+    ;;
+    stop)
+        unbind_mounts
+    ;;
+esac