|
8 | 8 | # serial execution of initialization steps. It will post the output when |
9 | 9 | # finished, if any. |
10 | 10 | # |
11 | | -# 2. If $HOME/proxy-target.txt exists, it means this is a proxy host, and the |
| 11 | +# 2. If $(pwd)/proxy-target.txt exists, it means this is a proxy host, and the |
12 | 12 | # real build machine is on the host specified by the login details inside |
13 | 13 | # that file. If the file does not exist, we are on the build slave itself. |
14 | 14 | # After figuring that stuff out, this script will run either on_proxy() or |
@@ -224,14 +224,14 @@ reset_nested_vm() { |
224 | 224 | fi |
225 | 225 | if [ ! -z "$login" ] |
226 | 226 | then |
227 | | - ip=`sed 's/.*@//' $HOME/proxy-target.txt` |
| 227 | + ip=`sed 's/.*@//' $(pwd)/proxy-target.txt` |
228 | 228 | if sudo arp | grep -q $ip |
229 | 229 | then |
230 | 230 | sudo arp -d $ip |
231 | 231 | fi |
232 | 232 | fi |
233 | 233 | $HOME/mender-qa/scripts/nested-vm.sh $HOME/*.qcow2 |
234 | | - login="`cat $HOME/proxy-target.txt`" |
| 234 | + login="`cat $(pwd)/proxy-target.txt`" |
235 | 235 | if $RSH $login true |
236 | 236 | then |
237 | 237 | echo "Nested VM is back up, it seems. Happily continuing!" |
@@ -273,7 +273,7 @@ reset_nested_vm() { |
273 | 273 | fi |
274 | 274 | } |
275 | 275 |
|
276 | | -if [ -f $HOME/proxy-target.txt ] |
| 276 | +if [ -f $(pwd)/proxy-target.txt ] |
277 | 277 | then |
278 | 278 | ret=0 |
279 | 279 | on_proxy || ret=$? |
|
288 | 288 | # Check target machine health. |
289 | 289 | # -------------------------------------------------------------------------- |
290 | 290 |
|
291 | | - login="$(cat $HOME/proxy-target.txt)" |
| 291 | + login="$(cat $(pwd)/proxy-target.txt)" |
292 | 292 |
|
293 | 293 | if [ ! -z "$login" ] && $RSH $login true |
294 | 294 | then |
|
0 commit comments