summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorjelle2012-09-03 19:15:18 +0000
committerFrederik “Freso” S. Olesen2015-07-12 15:29:04 +0200
commit902d46ae25c9114b43197273aacb9d9f3f43b209 (patch)
tree2bb6a9888be8bab997ea49993ef36610da751fc8
parentacedbc283682943ad4fc3636ba1293433f70d9e6 (diff)
downloadaur-902d46ae25c9114b43197273aacb9d9f3f43b209.tar.gz
upgpkg: networkmanager-dispatcher-ntpd 1.0-4
fix bug #30220, systemd ntp fix git-svn-id: file:///srv/repos/svn-community/svn@75862 9fca08f4-af9d-4005-b8df-a31f2cc04f65
-rw-r--r--.SRCINFO4
-rw-r--r--10-ntpd65
-rw-r--r--PKGBUILD4
3 files changed, 34 insertions, 39 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9034358688aa..3d022be419fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
pkgbase = networkmanager-dispatcher-ntpd
pkgdesc = Dispatcher Script for ntpd
pkgver = 1.0
- pkgrel = 3
+ pkgrel = 4
url = http://www.gnome.org/projects/NetworkManager
arch = any
license = BSD
depends = networkmanager
depends = ntp
source = 10-ntpd
- md5sums = 97956638b7e41fd4756b79bf9cd44000
+ md5sums = 340dd6683fcb30aa0b4c64a26d3bc48a
pkgname = networkmanager-dispatcher-ntpd
diff --git a/10-ntpd b/10-ntpd
index 9f2e528ae210..bc5e98bf8ef8 100644
--- a/10-ntpd
+++ b/10-ntpd
@@ -1,37 +1,32 @@
#!/bin/bash
-
- if [ -e /sys/fs/cgroup/systemd ]; then
- case "$2" in
- up)
- systemctl start systemd-timedated-ntp.target
- ;;
- vpn-up)
- systemctl start systemd-timedated-ntp.target
- ;;
- down)
- systemctl stop systemd-timedated-ntp.target
- ;;
- vpn-down)
- systemctl stop systemd-timedated-ntp.target
- ;;
- esac
- else
- if [ -e "/etc/rc.d/ntpd" ]; then
- case "$2" in
- up)
- /etc/rc.d/ntpd start
- ;;
- vpn-up)
- /etc/rc.d/ntpd start
- ;;
- down)
- /etc/rc.d/ntpd stop
- ;;
- vpn-down)
- /etc/rc.d/ntpd stop
- ;;
- esac
- fi
-
- fi
+timedate1() {
+ gdbus call \
+ --system \
+ --object-path /org/freedesktop/timedate1 \
+ --dest org.freedesktop.timedate1 \
+ --method org.freedesktop.timedate1.SetNTP "$@"
+}
+
+if [ -e /sys/fs/cgroup/systemd ]; then
+ case "$2" in
+ up)
+ timedate1 true false
+ ;;
+ down)
+ timedate1 false false
+ ;;
+ esac
+else
+ if [ -e "/etc/rc.d/ntpd" ]; then
+ case "$2" in
+ up)
+ rc.d start ntpd
+ ;;
+ down)
+ rc.d stop ntpd
+ ;;
+ esac
+ fi
+
+fi
diff --git a/PKGBUILD b/PKGBUILD
index 41022059a7c9..f8523b6d33b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
# Maintainer: Jelle van der Waa <jelle vdwaa nl>
pkgname=networkmanager-dispatcher-ntpd
pkgver=1.0
-pkgrel=3
+pkgrel=4
pkgdesc="Dispatcher Script for ntpd"
arch=(any)
license=('BSD')
url="http://www.gnome.org/projects/NetworkManager"
depends=('networkmanager' 'ntp')
source=("10-ntpd")
-md5sums=('97956638b7e41fd4756b79bf9cd44000')
+md5sums=('340dd6683fcb30aa0b4c64a26d3bc48a')
package() {
install -Dm700 $srcdir/10-ntpd $pkgdir/etc/NetworkManager/dispatcher.d/10-ntpd