@@ -7,33 +7,28 @@ STATE_DIR=/etc/xensource/static-vdis
7
7
[ -d ${STATE_DIR} ] || exit 0
8
8
[ -e /opt/xensource/bin/static-vdis ] || exit 0
9
9
10
- # Source function library.
11
- . /etc/init.d/functions
12
-
13
10
clear_stale_state (){
14
- for i in $( ls -1 $ {STATE_DIR}) ; do
11
+ for i in " $ {STATE_DIR}" / * ; do
15
12
# Clear the now-stale symlink to the attached disk. From this point the disk will
16
13
# be considered 'currently-attached=false'
17
- rm -f ${STATE_DIR} / ${i} /disk
14
+ rm -f " ${i} " /disk
18
15
19
16
# If the disk was supposed to be deleted altogether on reboot then do it now
20
- UUID=$( cat ${STATE_DIR} / ${i} /vdi-uuid)
21
- if [ -e ${STATE_DIR} / ${i} /delete-next-boot ]; then
17
+ UUID=$( cat " ${i} " /vdi-uuid)
18
+ if [ -e " ${i} " /delete-next-boot ]; then
22
19
logger " Deleting stale static-configured state for VDI: ${UUID} "
23
- rm -rf ${STATE_DIR} / ${i}
20
+ rm -rf " ${i} "
24
21
fi ;
25
22
done
26
23
}
27
24
28
25
attach_all (){
29
26
RC=0
30
- ALL=$( ls -1 ${STATE_DIR} )
31
27
32
- for i in ${ALL} ; do
33
- UUID=$( cat ${STATE_DIR} / ${i} /vdi-uuid)
28
+ for i in " ${STATE_DIR} " / * ; do
29
+ UUID=$( cat " ${i} " /vdi-uuid)
34
30
logger " Attempting to attach VDI: ${UUID} "
35
- OUTPUT=$( /opt/xensource/bin/static-vdis attach ${UUID} 2>&1 )
36
- if [ $? -ne 0 ]; then
31
+ if ! OUTPUT=$( /opt/xensource/bin/static-vdis attach " ${UUID} " 2>&1 ) ; then
37
32
RC=1
38
33
logger " Attempt to attach VDI: ${UUID} failed -- skipping (Error was: ${OUTPUT} )"
39
34
return $RC
@@ -43,13 +38,10 @@ attach_all(){
43
38
}
44
39
45
40
detach_all (){
46
- ALL=$( ls -1 ${STATE_DIR} )
47
-
48
- for i in ${ALL} ; do
49
- UUID=$( cat ${STATE_DIR} /${i} /vdi-uuid)
41
+ for i in " ${STATE_DIR} " /* ; do
42
+ UUID=$( cat " ${i} " /vdi-uuid)
50
43
logger " Attempting to detach VDI: ${UUID} "
51
- OUTPUT=$( /opt/xensource/bin/static-vdis detach ${UUID} 2>&1 )
52
- if [ $? -ne 0 ]; then
44
+ if ! OUTPUT=$( /opt/xensource/bin/static-vdis detach " ${UUID} " 2>&1 ) ; then
53
45
logger " Attempt to detach VDI: ${UUID} failed -- skipping (Error was: ${OUTPUT} )"
54
46
fi
55
47
done
0 commit comments