diff options
| author |   Vanessa Rene Valderrama <vvalderrama@linuxfoundation.org> | 2017-03-31 16:55:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@fd.io> | 2017-03-31 16:55:52 +0000 |
| commit | 3660f93a9f5a9a663beaf20e8fd6fb2772d76206 (patch) | |
| tree | caff780286dc275406c39372f65e13a85d0d25ff /packer/provision | |
| parent | bff1eeb500067a40d299f83a315408dcf87e4410 (diff) | |
| parent | 5a3c31ca725c506003dfa2cb3a374872f10a970d (diff) | |
Merge "Correct lock check failures"
Diffstat (limited to 'packer/provision')
| -rw-r--r-- | packer/provision/baseline.sh | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/packer/provision/baseline.sh b/packer/provision/baseline.sh index aaf1fa100..82edb3fe7 100644 --- a/packer/provision/baseline.sh +++ b/packer/provision/baseline.sh @@ -122,7 +122,10 @@ EOF i=0 tput sc -while [ fuser /var/lib/dpkg/lock >/dev/null 2>&1 || fuser /var/lib/apt/lists/lock >/dev/null 2>&1 ]; do +LOCKFILES="/var/lib/dpkg/lock /var/lib/apt/lists/lock" +WASLOCKED=0 +while [ fuser ${LOCKFILES} >/dev/null 2>&1 ]; do + WASLOCKED=$? case $(($i % 4)) in 0 ) j="-" ;; 1 ) j="\\" ;; @@ -135,7 +138,12 @@ while [ fuser /var/lib/dpkg/lock >/dev/null 2>&1 || fuser /var/lib/apt/lists/loc ((i=i+1)) done -/usr/bin/apt-get "$@" +if [ $WASLOCKED==0 ] +then + /usr/bin/apt-get "$@" +else + exec /usr/local/bin/apt-get "$@" +fi EOF chmod +x /usr/local/bin/apt-get |