diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-09-12 12:18:46 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-13 13:04:25 +0200 |
| commit | 01ad208333f7467e906dfaf0b56be50cb6945f95 (patch) | |
| tree | 362fd4cb43cedbfe0f34a15b2d711b6d02b15ae2 /coin/provisioning/common/linux | |
| parent | 6762ccb18664aee9e50b05a9d49042477405b9bb (diff) | |
| parent | 39a9e58888b19d4ad6e821b2498d85121b283c6c (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
This change partially reverts 24f0367a60fdd3379014e507fa7f4553d433c601.
Conflicts:
coin/platform_configs/default.yaml
SLES 12 got removed temporarily.
Task-number: QTQAINFRA-2851
Change-Id: Ib12a6e5ced3c89a5c8c9c2b1548a1c9d23d159d9
Diffstat (limited to 'coin/provisioning/common/linux')
| -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 |