summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorjelle2012-07-01 20:54:39 +0000
committerFrederik “Freso” S. Olesen2015-07-12 15:29:03 +0200
commitacedbc283682943ad4fc3636ba1293433f70d9e6 (patch)
tree825c7278389937cb0178af5d587ca19953444db8
parent790a509bdb60f07f1ef73db3f1f6f866f4512cca (diff)
downloadaur-acedbc283682943ad4fc3636ba1293433f70d9e6.tar.gz
upgpkg: networkmanager-dispatcher-ntpd 1.0-3
add support for systemd git-svn-id: file:///srv/repos/svn-community/svn@73112 9fca08f4-af9d-4005-b8df-a31f2cc04f65
-rw-r--r--.SRCINFO4
-rw-r--r--10-ntpd52
-rw-r--r--PKGBUILD4
3 files changed, 39 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f1235837e928..9034358688aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
pkgbase = networkmanager-dispatcher-ntpd
pkgdesc = Dispatcher Script for ntpd
pkgver = 1.0
- pkgrel = 2
+ pkgrel = 3
url = http://www.gnome.org/projects/NetworkManager
arch = any
license = BSD
depends = networkmanager
depends = ntp
source = 10-ntpd
- md5sums = 634640886979278dc3a74dbae342d3e7
+ md5sums = 97956638b7e41fd4756b79bf9cd44000
pkgname = networkmanager-dispatcher-ntpd
diff --git a/10-ntpd b/10-ntpd
index 8a46c62ba19e..9f2e528ae210 100644
--- a/10-ntpd
+++ b/10-ntpd
@@ -1,19 +1,37 @@
#!/bin/bash
-
-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
+
+ 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
diff --git a/PKGBUILD b/PKGBUILD
index c15b4455aa53..41022059a7c9 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=2
+pkgrel=3
pkgdesc="Dispatcher Script for ntpd"
arch=(any)
license=('BSD')
url="http://www.gnome.org/projects/NetworkManager"
depends=('networkmanager' 'ntp')
source=("10-ntpd")
-md5sums=('634640886979278dc3a74dbae342d3e7')
+md5sums=('97956638b7e41fd4756b79bf9cd44000')
package() {
install -Dm700 $srcdir/10-ntpd $pkgdir/etc/NetworkManager/dispatcher.d/10-ntpd