You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2017/02/23 00:11:03 UTC
[3/5] git commit: updated refs/heads/master to 87f1104
CLOUDSTACK-8324: updated the mount directory name and kvm virt device
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/65186078
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/65186078
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/65186078
Branch: refs/heads/master
Commit: 6518607885faf6867c34c90fe76dc78dadcbbe97
Parents: ea09e6c
Author: Jayapal <ja...@accelerite.com>
Authored: Wed Feb 15 13:58:54 2017 +0530
Committer: Jayapal <ja...@accelerite.com>
Committed: Wed Feb 15 13:58:54 2017 +0530
----------------------------------------------------------------------
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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65186078/setup/bindir/cloud-get-vm-data-configdrive.in
----------------------------------------------------------------------
diff --git a/setup/bindir/cloud-get-vm-data-configdrive.in b/setup/bindir/cloud-get-vm-data-configdrive.in
index 40fbc78..a862fe0 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65186078/setup/bindir/cloud-set-guest-password-configdrive.in
----------------------------------------------------------------------
diff --git a/setup/bindir/cloud-set-guest-password-configdrive.in b/setup/bindir/cloud-set-guest-password-configdrive.in
index 0fe1dec..1aef8bc 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
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/65186078/setup/bindir/cloud-set-guest-sshkey-configdrive.in
----------------------------------------------------------------------
diff --git a/setup/bindir/cloud-set-guest-sshkey-configdrive.in b/setup/bindir/cloud-set-guest-sshkey-configdrive.in
index 773f92e..df10b43 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