commit 8b9182db302c7c65d5cedaa9269e9ec7bf031d0b
author Scott Baker <smbaker@gmail.com> Thu Oct 27 17:53:52 2016 -0700
committer Scott Baker <smbaker@gmail.com> Wed Nov 02 15:12:15 2016 -0700
tree ae9445da52f2fa36142157f76e61c8562b778b7e
parent 5c2e4fa2fbee6e485770d6706720f53fb518c270

different way of handling cloudlab extra space

Change-Id: Ic28ffb2847d2d348d7217cd380b21d2f1aef8cf4

scripts/cord-in-a-box.sh

diff --git a/scripts/cord-in-a-box.sh b/scripts/cord-in-a-box.sh
index 7091493..3ae74e0 100755
--- a/scripts/cord-in-a-box.sh
+++ b/scripts/cord-in-a-box.sh
@@ -101,8 +101,18 @@
 function cloudlab_setup() {
   if [ -e /usr/testbed/bin/mkextrafs ]
   then
+    sudo mkdir -p /var/extra
+
     # Sometimes this command fails on the first try
-    sudo /usr/testbed/bin/mkextrafs -r /dev/sdb -qf "/var/lib/libvirt/images/" || sudo /usr/testbed/bin/mkextrafs -r /dev/sdb -qf "/var/lib/libvirt/images/"
+    sudo /usr/testbed/bin/mkextrafs -r /dev/sdb -qf "/var/extra/" || sudo /usr/testbed/bin/mkextrafs -r /dev/sdb -qf "/var/extra/"
+
+    # we'll replace /var/lib/libvirt/images with a symlink below
+    [ -d /var/lib/libvirt/images/ ] && [ ! -h /var/lib/libvirt/images ] && sudo rmdir /var/lib/libvirt/images
+
+    sudo mkdir -p /var/extra/libvirt_images
+    sudo mkdir -p /var/extra/docker
+    [ ! -e /var/lib/libvirt/images ] && sudo ln -s /var/extra/libvirt_images /var/lib/libvirt/images
+    [ ! -e /var/lib/docker ] && sudo ln -s /var/extra/docker /var/lib/docker
 
     cd $CORDDIR/build
     SRC="#- 'on_cloudlab=True'"