From 6518607885faf6867c34c90fe76dc78dadcbbe97 Mon Sep 17 00:00:00 2001 From: Jayapal Date: Wed, 15 Feb 2017 13:58:54 +0530 Subject: [PATCH] CLOUDSTACK-8324: updated the mount directory name and kvm virt device --- setup/bindir/cloud-get-vm-data-configdrive.in | 2 +- setup/bindir/cloud-set-guest-password-configdrive.in | 4 ++-- setup/bindir/cloud-set-guest-sshkey-configdrive.in | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/setup/bindir/cloud-get-vm-data-configdrive.in b/setup/bindir/cloud-get-vm-data-configdrive.in index 40fbc788467..a862fe0c098 100644 --- a/setup/bindir/cloud-get-vm-data-configdrive.in +++ b/setup/bindir/cloud-get-vm-data-configdrive.in @@ -17,7 +17,7 @@ # under the License. -mountdir=/mnt/configdrive +mountdir=$(mktemp -d) filepath=$mountdir/cloudstack user_data=$filepath/userdata/user_data.txt diff --git a/setup/bindir/cloud-set-guest-password-configdrive.in b/setup/bindir/cloud-set-guest-password-configdrive.in index 0fe1dec4452..1aef8bc7907 100644 --- a/setup/bindir/cloud-set-guest-password-configdrive.in +++ b/setup/bindir/cloud-set-guest-password-configdrive.in @@ -26,7 +26,7 @@ # Modify this line to specify the user (default is root) user=root -mountdir=/mnt/configdrive +mountdir=$(mktemp -d) # If lable name is other than config, please change the below line as required DefaultDisk=/dev/disk/by-label/config @@ -45,7 +45,7 @@ function prepare_mount if [ -e $DefaultDisk ]; then Disk=$DefaultDisk else - BLOCK_DEVICE=$(blkid -t LABEL='config' /dev/hd? /dev/sd? /dev/xvd? -o device) + BLOCK_DEVICE=$(blkid -t LABEL='config' /dev/hd? /dev/sd? /dev/xvd? /dev/vd? -o device) if [ -n $BLOCK_DEVICE ]; then Disk=$BLOCK_DEVICE else diff --git a/setup/bindir/cloud-set-guest-sshkey-configdrive.in b/setup/bindir/cloud-set-guest-sshkey-configdrive.in index 773f92e27e3..df10b436035 100644 --- a/setup/bindir/cloud-set-guest-sshkey-configdrive.in +++ b/setup/bindir/cloud-set-guest-sshkey-configdrive.in @@ -26,7 +26,7 @@ # Modify this line to specify the user (default is root) user=root -mountdir=/mnt/configdrive +mountdir=$(mktemp -d) # If lable name is other than config, please change the below line as required DefaultDisk=/dev/disk/by-label/config @@ -44,7 +44,7 @@ function prepare_mount if [ -e $DefaultDisk ]; then Disk=$DefaultDisk else - BLOCK_DEVICE=$(blkid -t LABEL='config' /dev/hd? /dev/sd? /dev/xvd? -o device) + BLOCK_DEVICE=$(blkid -t LABEL='config' /dev/hd? /dev/sd? /dev/xvd? /dev/vd? -o device) if [ -n $BLOCK_DEVICE ]; then Disk=$BLOCK_DEVICE else