diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-08-28 20:28:11 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-08-28 20:28:11 +0200 |
| commit | f58935ebea9f457a05839240755b032da1144d7a (patch) | |
| tree | a18a1db249327c702109352230bbfa811a8f8789 /coin/provisioning/common | |
| parent | 097b013183e1090e6b28691136ac7d7b5bfc574e (diff) | |
| parent | 163bd8006e32184ad77654dd36d3cba417c65028 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
coin/platform_configs/default.yaml
coin/provisioning/common/linux/disable-ntp_linux.sh
coin/provisioning/qtci-linux-SLES-12-x86_64/55-emsdk.sh
coin/provisioning/qtci-linux-SLES-15-x86_64/55-emsdk.sh
emsdk.sh was moved from linux to unix, see
38e416be664dc216b332e6b4ff8d38905dfdc1e9
Change-Id: I5b06dde2860a4e4869960ae2a5be1d6a1396e957
Diffstat (limited to 'coin/provisioning/common')
| -rwxr-xr-x | coin/provisioning/common/linux/disable-notifications.sh | 4 | ||||
| -rwxr-xr-x | coin/provisioning/common/linux/disable-ntp_linux.sh | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/coin/provisioning/common/linux/disable-notifications.sh b/coin/provisioning/common/linux/disable-notifications.sh index 7e805833..28d21656 100755 --- a/coin/provisioning/common/linux/disable-notifications.sh +++ b/coin/provisioning/common/linux/disable-notifications.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash -sudo gsettings set org.gnome.desktop.notifications.application:/update-manager/ enable false -sudo gsettings set org.gnome.desktop.notifications show-banners false +gsettings set org.gnome.desktop.notifications.application:/update-manager/ enable false +gsettings set org.gnome.desktop.notifications show-banners false diff --git a/coin/provisioning/common/linux/disable-ntp_linux.sh b/coin/provisioning/common/linux/disable-ntp_linux.sh index 06d17be0..c509d36b 100755 --- a/coin/provisioning/common/linux/disable-ntp_linux.sh +++ b/coin/provisioning/common/linux/disable-ntp_linux.sh @@ -41,6 +41,8 @@ if uname -a |grep -q "Ubuntu"; then sudo timedatectl set-ntp false elif cat /etc/os-release | grep "PRETTY_NAME" | grep -q "Leap 15"; then (sudo systemctl stop chronyd && sudo systemctl disable chronyd) +elif cat /etc/os-release |grep "SUSE Linux Enterprise Server 15"; then + sudo timedatectl set-ntp false else (systemctl &>/dev/null && sudo systemctl disable ntpd) || sudo /sbin/chkconfig ntpd off fi |