diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-08-22 11:02:40 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-08-22 11:02:40 +0200 |
| commit | 55a7d75889507a9882c91f8c0a44ea9460a5d095 (patch) | |
| tree | e4d40e8bdb76614317edbd6d07f1d226eb80bb39 /extra/ntp | |
| parent | f23b8ed12499118d66340154fe8369623da3da34 (diff) | |
| parent | 297a042ac9a7bbd2b18a9551f5fa4fe43faf53b2 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
core/rfkill/PKGBUILD
extra/libkgapi/PKGBUILD
extra/transmission/PKGBUILD
testing/grep/PKGBUILD
testing/grep/grep.install
Diffstat (limited to 'extra/ntp')
| -rw-r--r-- | extra/ntp/PKGBUILD | 9 | ||||
| -rw-r--r-- | extra/ntp/ntpd.service | 8 |
2 files changed, 10 insertions, 7 deletions
diff --git a/extra/ntp/PKGBUILD b/extra/ntp/PKGBUILD index 6b7d72b86..6a7337f79 100644 --- a/extra/ntp/PKGBUILD +++ b/extra/ntp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 162162 2012-06-22 12:59:21Z dreisner $ +# $Id: PKGBUILD 165490 2012-08-20 19:14:16Z dreisner $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> pkgname=ntp pkgver=4.2.6.p5 _realver=4.2.6p5 -pkgrel=7 +pkgrel=10 pkgdesc='Network Time Protocol reference implementation' url='http://www.ntp.org/' license=('custom') @@ -26,7 +26,7 @@ sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192' 'eb1f63814b9adbd3d518e880fa3b38c375f0fe91' '4537d1f58b299d463db5048129cb264511474b0b' '4f76f7f9ffc8315ff9924f793f272d4f6939b816' - '81df5c4d51cb69bc29363625ff49e2bd388d1fa9') + '25a27cecdb937f48fa7b7c71dcc8b31cdad89306') install=install @@ -61,4 +61,7 @@ package() { install -d "${pkgdir}"/usr/share/man mv man/man* "${pkgdir}"/usr/share/man mv "${pkgdir}/usr/share/man/man8/ntpd.8" "${pkgdir}/usr/share/man/man8/ntp-ntpd.8" # we should ditch openntpd + + install -dm755 "$pkgdir/usr/lib/ntp-units.d" + echo "ntpd.service" > "$pkgdir/usr/lib/ntp-units.d/$pkgname.list" } diff --git a/extra/ntp/ntpd.service b/extra/ntp/ntpd.service index e0cbf879e..dcb5df634 100644 --- a/extra/ntp/ntpd.service +++ b/extra/ntp/ntpd.service @@ -1,12 +1,12 @@ [Unit] Description=Network Time Service -After=network.target +After=network.target nss-lookup.target [Service] Type=forking -PIDFile=/run/ntpd.pid -EnvironmentFile=/etc/conf.d/ntpd.conf -ExecStart=/usr/bin/ntpd $NTPD_ARGS -p /run/ntpd.pid +PrivateTmp=true +ExecStart=/usr/bin/ntpd -g -u ntp:ntp +ControlGroup=cpu:/ [Install] WantedBy=multi-user.target |