diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-20 21:22:31 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-20 22:33:59 +0100 |
| commit | 91739f5fe3554f0c847346d6011e20de2a24f586 (patch) | |
| tree | 6a6874edbd74692712480ad31bbd102fc2a9ce57 /coin/provisioning/qtci-linux-openSUSE-42.3-x86_64 | |
| parent | c64b2415d326f21119399b76549ef9de3195b538 (diff) | |
| parent | e086fbc6cb80b089ed3e336a47e849fc1b5023ca (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.11
Conflicts:
coin/provisioning/common/linux/open62541.sh
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh
coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh
Done-with: Maurice Kalinowski <maurice.kalinowski@qt.io>
Change-Id: Icd472b8f770a933bafead48093ecf7eb94156128
Diffstat (limited to 'coin/provisioning/qtci-linux-openSUSE-42.3-x86_64')
| -rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh index 4ebc1b44..c0e7b8e9 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh @@ -7,13 +7,18 @@ source $BASEDIR/../common/shared/network_test_server_ip.txt source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc +echo "Set grub timeout to 0" +sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub +sudo update-grub echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts echo "Set DISPLAY" echo 'export DISPLAY=":0"' >> ~/.bashrc +echo "Disabling file indexing." +sudo balooctl disable -if [ "$proxy" != "" ]; then +if [ "$http_proxy" != "" ]; then sudo sed -i 's/PROXY_ENABLED=\"no\"/PROXY_ENABLED=\"yes\"/' /etc/sysconfig/proxy sudo sed -i "s|HTTP_PROXY=\".*\"|HTTP_PROXY=\"$proxy\"|" /etc/sysconfig/proxy fi |