Skip to content

Commit 6518607

Browse files
committed
CLOUDSTACK-8324: updated the mount directory name and kvm virt device
1 parent ea09e6c commit 6518607

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

setup/bindir/cloud-get-vm-data-configdrive.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# under the License.
1818

1919

20-
mountdir=/mnt/configdrive
20+
mountdir=$(mktemp -d)
2121
filepath=$mountdir/cloudstack
2222

2323
user_data=$filepath/userdata/user_data.txt

setup/bindir/cloud-set-guest-password-configdrive.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
# Modify this line to specify the user (default is root)
2727
user=root
2828

29-
mountdir=/mnt/configdrive
29+
mountdir=$(mktemp -d)
3030

3131
# If lable name is other than config, please change the below line as required
3232
DefaultDisk=/dev/disk/by-label/config
@@ -45,7 +45,7 @@ function prepare_mount
4545
if [ -e $DefaultDisk ]; then
4646
Disk=$DefaultDisk
4747
else
48-
BLOCK_DEVICE=$(blkid -t LABEL='config' /dev/hd? /dev/sd? /dev/xvd? -o device)
48+
BLOCK_DEVICE=$(blkid -t LABEL='config' /dev/hd? /dev/sd? /dev/xvd? /dev/vd? -o device)
4949
if [ -n $BLOCK_DEVICE ]; then
5050
Disk=$BLOCK_DEVICE
5151
else

setup/bindir/cloud-set-guest-sshkey-configdrive.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
# Modify this line to specify the user (default is root)
2727
user=root
2828

29-
mountdir=/mnt/configdrive
29+
mountdir=$(mktemp -d)
3030

3131
# If lable name is other than config, please change the below line as required
3232
DefaultDisk=/dev/disk/by-label/config
@@ -44,7 +44,7 @@ function prepare_mount
4444
if [ -e $DefaultDisk ]; then
4545
Disk=$DefaultDisk
4646
else
47-
BLOCK_DEVICE=$(blkid -t LABEL='config' /dev/hd? /dev/sd? /dev/xvd? -o device)
47+
BLOCK_DEVICE=$(blkid -t LABEL='config' /dev/hd? /dev/sd? /dev/xvd? /dev/vd? -o device)
4848
if [ -n $BLOCK_DEVICE ]; then
4949
Disk=$BLOCK_DEVICE
5050
else

0 commit comments

Comments
 (0)