From 491fe03355a18da7041e16ecb953bfbe9efe52f1 Mon Sep 17 00:00:00 2001
From: Edward Viaene <ward.viaene@gmail.com>
Date: Wed, 29 Nov 2017 07:57:14 +0000
Subject: [PATCH] volume.sh script fixes

---
 demo-10/scripts/init.cfg   |  1 -
 demo-10/scripts/volumes.sh | 23 +++++++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/demo-10/scripts/init.cfg b/demo-10/scripts/init.cfg
index a22584e..2423288 100644
--- a/demo-10/scripts/init.cfg
+++ b/demo-10/scripts/init.cfg
@@ -4,7 +4,6 @@ repo_update: true
 repo_upgrade: all
 
 packages:
-  - docker.io
   - lvm2
   
 runcmd:
diff --git a/demo-10/scripts/volumes.sh b/demo-10/scripts/volumes.sh
index 60b192b..232b22b 100644
--- a/demo-10/scripts/volumes.sh
+++ b/demo-10/scripts/volumes.sh
@@ -1,14 +1,29 @@
 #!/bin/bash
 
+set -ex 
+
 vgchange -ay
 
 DEVICE_FS=`blkid -o value -s TYPE ${DEVICE}`
 if [ "`echo -n $DEVICE_FS`" == "" ] ; then 
-	pvcreate ${DEVICE}
-	vgcreate data ${DEVICE}
-	lvcreate --name volume1 -l 100%FREE data
-	mkfs.ext4 /dev/data/volume1
+  # wait for the device to be attached
+  DEVICENAME=`echo "${DEVICE}" | awk -F '/' '{print $3}'`
+  DEVICEEXISTS=''
+  while [[ -z $DEVICEEXISTS ]]; do
+    echo "checking $DEVICENAME"
+    DEVICEEXISTS=`lsblk |grep "$DEVICENAME" |wc -l`
+    if [[ $DEVICEEXISTS != "1" ]]; then
+      sleep 15
+    fi
+  done
+  pvcreate ${DEVICE}
+  vgcreate data ${DEVICE}
+  lvcreate --name volume1 -l 100%FREE data
+  mkfs.ext4 /dev/data/volume1
 fi
 mkdir -p /data
 echo '/dev/data/volume1 /data ext4 defaults 0 0' >> /etc/fstab
 mount /data
+
+# install docker
+curl https://get.docker.com | bash