From 22858b5297523fcc4811da08b62da11993763ec7 Mon Sep 17 00:00:00 2001 From: Edward Viaene Date: Fri, 14 Oct 2016 09:29:08 +0000 Subject: [PATCH] script changes --- demo-10/scripts/init.cfg | 2 +- demo-10/scripts/volumes.sh | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/demo-10/scripts/init.cfg b/demo-10/scripts/init.cfg index c50b827..0ee0b9e 100644 --- a/demo-10/scripts/init.cfg +++ b/demo-10/scripts/init.cfg @@ -4,7 +4,7 @@ repo_update: true repo_upgrade: all packages: - - docker + - docker.io - lvm2 output: diff --git a/demo-10/scripts/volumes.sh b/demo-10/scripts/volumes.sh index f0f6861..60b192b 100644 --- a/demo-10/scripts/volumes.sh +++ b/demo-10/scripts/volumes.sh @@ -3,11 +3,12 @@ vgchange -ay DEVICE_FS=`blkid -o value -s TYPE ${DEVICE}` -exit 0 -pvcreate ${DEVICE} -vgcreate data ${DEVICE} -lvcreate --name volume1 -l 100%FREE data -mkfs.ext4 /dev/data/volume1 +if [ "`echo -n $DEVICE_FS`" == "" ] ; then + pvcreate ${DEVICE} + vgcreate data ${DEVICE} + lvcreate --name volume1 -l 100%FREE data + mkfs.ext4 /dev/data/volume1 +fi mkdir -p /data -echo '/dev/data/volume /data defaults 0 0' >> /etc/fstab +echo '/dev/data/volume1 /data ext4 defaults 0 0' >> /etc/fstab mount /data