diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-07 09:36:59 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-07 09:37:28 +0100 |
| commit | 25a0f1fa08fcb127ec138f0f457feaad53c27534 (patch) | |
| tree | 7fdf319d8e531b0932687e99a9e7e904b8c48f9a /coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64 | |
| parent | 532f1dea57210970cb8449fbb94f46e356706163 (diff) | |
| parent | 9a160d28d57605db98353740523d086ea5c5446d (diff) | |
Merge remote-tracking branch 'origin/5.10' into 5.10.1
Change-Id: I275589752f6f623e61841a4552087a1875729615
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" |