Skip to content

Commit 3afab9a

Browse files
Updated setup-sysvm-tmplt script, to run cmds accessing destdir with sudo (#10263)
1 parent 6f334eb commit 3afab9a

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

scripts/storage/secondary/setup-sysvm-tmplt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ if [[ -f $destdir/template.properties ]]; then
9999
failed 2 "Data already exists at destination $destdir"
100100
fi
101101

102-
destfiles=$(find $destdir -name \*.$ext)
102+
destfiles=$(sudo find $destdir -name \*.$ext)
103103
if [[ "$destfiles" != "" ]]; then
104104
failed 2 "Data already exists at destination $destdir"
105105
fi
@@ -108,12 +108,12 @@ tmpfolder=/tmp/cloud/templates/
108108
mkdir -p $tmpfolder
109109
tmplfile=$tmpfolder/$localfile
110110

111-
sudo touch $tmplfile
111+
touch $tmplfile
112112
if [[ $? -ne 0 ]]; then
113113
failed 2 "Failed to create temporary file in directory $tmpfolder -- is it read-only or full?\n"
114114
fi
115115

116-
destcap=$(df -P $destdir | awk '{print $4}' | tail -1 )
116+
destcap=$(sudo df -P $destdir | awk '{print $4}' | tail -1 )
117117
[ $destcap -lt $DISKSPACE ] && echo "Insufficient free disk space for target folder $destdir: avail=${destcap}k req=${DISKSPACE}k" && failed 4
118118

119119
localcap=$(df -P $tmpfolder | awk '{print $4}' | tail -1 )
@@ -146,9 +146,9 @@ fi
146146

147147

148148
tmpltfile=$destdir/$localfile
149-
tmpltsize=$(ls -l $tmpltfile | awk -F" " '{print $5}')
149+
tmpltsize=$(sudo ls -l $tmpltfile | awk -F" " '{print $5}')
150150
if [[ "$ext" == "qcow2" ]]; then
151-
vrtmpltsize=$($qemuimgcmd info $tmpltfile | grep -i 'virtual size' | sed -ne 's/.*(\([0-9]*\).*/\1/p' | xargs)
151+
vrtmpltsize=$(sudo $qemuimgcmd info $tmpltfile | grep -i 'virtual size' | sed -ne 's/.*(\([0-9]*\).*/\1/p' | xargs)
152152
else
153153
vrtmpltsize=$tmpltsize
154154
fi

server/conf/cloudstack-sudoers.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# The CloudStack management server needs sudo permissions
1919
# without a password.
2020

21-
Cmnd_Alias CLOUDSTACK = /bin/mkdir, /bin/mount, /bin/umount, /bin/cp, /bin/chmod, /usr/bin/keytool, /bin/keytool, /bin/touch
21+
Cmnd_Alias CLOUDSTACK = /bin/mkdir, /bin/mount, /bin/umount, /bin/cp, /bin/chmod, /usr/bin/keytool, /bin/keytool, /bin/touch, /bin/find, /bin/df, /bin/ls, /bin/qemu-img
2222

2323
Defaults:@MSUSER@ !requiretty
2424

0 commit comments

Comments
 (0)