diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-03 11:08:26 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-03 11:08:26 +0100 |
| commit | 4cd14f462539e4873e86c2122bb8422f5f62fc29 (patch) | |
| tree | 93da830768a750b44b13b2939ccd8dfa73d3b707 /coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64 | |
| parent | d10baa6d3a405011b3de101d1e2142d662ba4f30 (diff) | |
| parent | 4eaa0170231457c90a5465f4820d29bb7f64ce3d (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I3e4ae2508d632919db77af0f365eb25ace1a69e0
Diffstat (limited to 'coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64')
3 files changed, 4 insertions, 2 deletions
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh index 5d36f57b..6c198b1d 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh @@ -39,8 +39,6 @@ set -ex source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh" source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" -# shellcheck source=../common/unix/try_catch.sh -source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh" NTS_IP=10.212.2.216 diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh index d15e0059..a2132209 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh @@ -159,6 +159,7 @@ catch || { ;; $ExceptionAPT) echo "Failed to install package." + sudo lsof /var/lib/dpkg/lock exit 1; ;; $ExceptionSED) diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh new file mode 100755 index 00000000..ca31a876 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-disable-ntp.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh" |