Move extra space to /mnt/extra
Change-Id: I2ea5b77b1690f7ecd0be533acda652f64a23e6cb
diff --git a/scripts/cord-in-a-box.sh b/scripts/cord-in-a-box.sh
index 82dffac..fa6cd5e 100755
--- a/scripts/cord-in-a-box.sh
+++ b/scripts/cord-in-a-box.sh
@@ -101,20 +101,23 @@
function cloudlab_setup() {
if [ -e /usr/testbed/bin/mkextrafs ]
then
- sudo mkdir -p /var/extra
+ sudo mkdir -p /mnt/extra
# Sometimes this command fails on the first try
- sudo /usr/testbed/bin/mkextrafs -r /dev/sdb -qf "/var/extra/" || sudo /usr/testbed/bin/mkextrafs -r /dev/sdb -qf "/var/extra/"
+ sudo /usr/testbed/bin/mkextrafs -r /dev/sdb -qf "/mnt/extra/" || sudo /usr/testbed/bin/mkextrafs -r /dev/sdb -qf "/mnt/extra/"
+
+ # Check that the mount succeeded (sometimes mkextrafs succeeds but device not mounted)
+ mount | grep sdb
# 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
- sudo mkdir -p /var/extra/docker-registry
- [ ! -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
- [ ! -e /docker-registry ] && sudo ln -s /var/extra/docker-registry /docker-registry
+ sudo mkdir -p /mnt/extra/libvirt_images
+ sudo mkdir -p /mnt/extra/docker
+ sudo mkdir -p /mnt/extra/docker-registry
+ [ ! -e /var/lib/libvirt/images ] && sudo ln -s /mnt/extra/libvirt_images /var/lib/libvirt/images
+ [ ! -e /var/lib/docker ] && sudo ln -s /mnt/extra/docker /var/lib/docker
+ [ ! -e /docker-registry ] && sudo ln -s /mnt/extra/docker-registry /docker-registry
cd $CORDDIR/build
SRC="#- 'on_cloudlab=True'"