diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-04 15:30:50 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-04 15:30:50 +0100 |
| commit | 0e4931a8afa3e0a96df4a01b056ec82a274b7e45 (patch) | |
| tree | 901b8a075331c702abec0e27c50fdd17bb3d6b54 /coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64 | |
| parent | 61cd31a5e37348945d81024fd2c4936c6c1f9e92 (diff) | |
| parent | 4cd14f462539e4873e86c2122bb8422f5f62fc29 (diff) | |
Merge remote-tracking branch 'origin/5.10' into 5.11
Change-Id: I3b299786e8500b0a8f2c197f7501f8e6e1cf29cf
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 1a679695..73916cb3 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 @@ -163,6 +163,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" |