For discussion of Alpine Linux development and developer support

1

[alpine-devel] [PATCH] main/busybox-initscripts: ntpd init and conf

Eivind Uggedal
Details
Message ID
<1395059980-31262-1-git-send-email-eivind@uggedal.com>
Sender timestamp
1395059980
DKIM signature
missing
Download raw message
Patch: +26 -5
Replaces openntpd init script and conf with the same
name.
---
 main/busybox-initscripts/APKBUILD   | 16 +++++++++++-----
 main/busybox-initscripts/ntpd.confd |  2 ++
 main/busybox-initscripts/ntpd.initd | 13 +++++++++++++
 3 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 main/busybox-initscripts/ntpd.confd
 create mode 100755 main/busybox-initscripts/ntpd.initd

diff --git a/main/busybox-initscripts/APKBUILD b/main/busybox-initscripts/APKBUILD
index 9bfac7e91a1c..b44b6fee58c4 100644
--- a/main/busybox-initscripts/APKBUILD
+++ b/main/busybox-initscripts/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=busybox-initscripts
 pkgver=2.2
-pkgrel=15
+pkgrel=16
 pkgdesc="Init scripts for busybox daemons"
 url="http://git.alpinelinux.org/cgit/aports/tree/core/busybox-initscripts"
 arch="noarch"
@@ -11,11 +11,11 @@ depends="busybox"
 makedepends=
 install=$pkgname.post-install
 subpackages=
-replaces="alpine-baselayout"
+replaces="alpine-baselayout openntpd"
 source="acpid.initd cron.initd dnsd.initd httpd.initd inetd.initd klogd.initd 
-	mdev-mount.initd mdev.initd rdate.initd syslog.initd watchdog.initd
-	cron.confd klogd.confd rdate.confd syslog.confd watchdog.confd
-	mdev.conf dvbdev ide_links usbdev usbdisk_link xvd_links
+	mdev-mount.initd mdev.initd ntpd.initd rdate.initd syslog.initd
+	watchdog.initd cron.confd klogd.confd ntpd.confd rdate.confd syslog.confd
+	watchdog.confd mdev.conf dvbdev ide_links usbdev usbdisk_link xvd_links
 	default.script
 	"
 
@@ -59,11 +59,13 @@ dc825f26e9153f8f7d77162c66f7d876  dnsd.initd
 8b7ced45d0880e3f1b6a1047520de035  klogd.initd
 6de9bac27127a7e1dbcc86acbc920521  mdev-mount.initd
 8ead1e5bb37f536ca736a1e0d0cd7522  mdev.initd
+18bf06b0fd7446437edc1866a82e6d7a  ntpd.initd
 c01dc869cbdd68e86e64a35ccc1e885e  rdate.initd
 b4b0db90a0e341a39baf55eacbda79c2  syslog.initd
 aed11322e338cb98a22b11fe71200c58  watchdog.initd
 8ddb8d040c9c7a32c63039a2c80ff496  cron.confd
 60bc14cc3163d76f41bcc93dc0f9984b  klogd.confd
+779058fe16d8a476c165b6d0928408b3  ntpd.confd
 22adbf155ffc4595206ded6daad07812  rdate.confd
 77fb31a75511247bf4e3430565a276bc  syslog.confd
 0bb55dde32f5e119111fa4938daaef3d  watchdog.confd
@@ -82,11 +84,13 @@ efd49fa6aed1f4a7fcbdbc66bc9bfa07be88df500c95d6ee2758d9f45e2bfd3c  inetd.initd
 248b8a2e6fed69454146a89bb1fa8a1927a09c1f6d28965f4b9dcc4ac20513b3  klogd.initd
 2e926542fd4e0fb16e2655ddef0d0cd752178757eff4f19ad09714509e534951  mdev-mount.initd
 9d3fefb7f1e76eefd61151013da014694a6f2f74b9594b7276633db636bdcc7f  mdev.initd
+b806ed12627d57192c5de91eaf961d9aac25cec2e4b146702d22f10987953c0c  ntpd.initd
 fe551ee6bf08b6e0e9eaea3c93edead6e0ed3aa7c9c1129ba3c503bebdbc7c25  rdate.initd
 307dd78e4fc738e0a45e9d57cf895ae1e0d00f4a7a7a6f75cd0c6927ff7d348c  syslog.initd
 8bbfdccb64fe94e3537b71ec2aab43b7050e8a099c4c779e00c5ee1e13dc3061  watchdog.initd
 6b466c5b0e9cab7613aa56edf383e891c5c7e26ee00467e9f7913808be23a328  cron.confd
 f6cd63d6e5f384dcb01a4906c9a0b6c5923794380235dfe0d79b48a686b03c5d  klogd.confd
+4224e5c6b5ffeb815c15f3e9f17ddaa169d4e6b7da169dbd0939fe06dbe8914d  ntpd.confd
 791d49802395861a5f788dc7436c1260ec2cd3bdea0c790952ae1b2dd518e811  rdate.confd
 8a2362d6b5b1ec1d754878726392119f2cc7416c748ee4f2ab134f731d6e6198  syslog.confd
 77f6f9069afdbb477a7e822aa2c7265d64fd22fdd9338bb3beb0cee901d202ce  watchdog.confd
@@ -105,11 +109,13 @@ e5856b6d83047a84f9332a0634de5f165e65878138298a1c737b9326be5a206d24f43227a88b5644
 0466c53d6cfc62603e1b0c9c5b6551076d3a33ac138a2064339db9ebec2adafb62c4d7ccfb414e6d97260d4abd42efe7d6bda7dafe9ce55e944b10b7cde3d2ef  klogd.initd
 2d43f3d9fb48164b34daaa55e8f2936d6235dd14b1bb368b4bdc90bd870c595fce39accd981ecb23bacdaddf9fa2adbea4eb9ee7080e9dd2fff8e7636f5f9f16  mdev-mount.initd
 2d19e8bb43c5378421934dd436ec36896883b6c35364358b3ee34f6f1fb07f3f49290e0cd32b3d3dc5b863a92a5c4dfe0942e6b62889171edde864fd0b84163c  mdev.initd
+2cc362448ca6b1fba5cf7b252305acc1fbf3de472c1cc049dd1fcd29051bd7d89955873b0f567cb09e27230e5e73c3e861d2d3a2b1e2c063b39316d9a7582a37  ntpd.initd
 6297d604926b4f13155b8382d6713a820c48d97ce001f6571c1a66b3b96f0f5f6ec6eb684d99016d961b8f72ddd8300e30eebccb84b8064f7582aba88493a017  rdate.initd
 5bd3634fe5d7a592369b164f126a56891477e22df6685ff204d1e56973fd182b209f74671378cbf6b78af9764e2788bd5bec9e7e58fbbe1314bb004c4fb445e7  syslog.initd
 f4ddd0acdfff4aa1972e19e7181b363cb3d73e075acd6cc98d153d7748ab2d213a99c9be30f65c696f13bc72782cbb89ad584e3c837f10904bce295dfa79df35  watchdog.initd
 49c4299eca93517f09c6af71dd6bf737fec4006dfbf72b696fc3ec3e39d61fdd63107cae1bd883b2539848d52e6f6b1ed494d0c871e92e50fc55669295f3585e  cron.confd
 f9bf43b72142bbb4c0665c1268a3d91586ef8a057dfe64c53b6923815d2db1f669b8080a38311ad89cda0b783a8628700fc5414d834a21d8e48515760bb910f7  klogd.confd
+b0ba67585f39d83320ed6de183d7463a0e163807b9f3dc6f0baa212236056f22aeb2c5399dfdcd54929eb5ae06a15714c2fed133b5888869ed9d9cf589cef843  ntpd.confd
 3d6c4d358e226e0c0462f2003bcf0b6787f91a53f4d6b6db5bfe7748bb0dd392d7cc454058ea8a9b649e8dd2629963a5ad1257c36af04367caeb1923f954daf7  rdate.confd
 330c6e6808dfdf05c75dcdec1048f17052f79b285e11513a64a97bf28fb60e023840966abe03a74fa146eb6b842c4e0e78df82918528e0b6e8f546f7f0a4e323  syslog.confd
 359af0a4a1841dd6557eaf3e71d39f0d7a2687bad6a8fc6ef436eccf72a40f85c6400a3b7880c7f64d8e460b6af8a0ff3dd5ffc3a4b1aa8eb0d8f7eaf99ee3e4  watchdog.confd
diff --git a/main/busybox-initscripts/ntpd.confd b/main/busybox-initscripts/ntpd.confd
new file mode 100644
index 000000000000..c5b4c1c1d435
--- /dev/null
+++ b/main/busybox-initscripts/ntpd.confd
@@ -0,0 +1,2 @@
+# By default ntpd runs as a client. Add -l to run as a server on port 123.
+NTPD_OPTS="-N -p pool.ntp.org"
diff --git a/main/busybox-initscripts/ntpd.initd b/main/busybox-initscripts/ntpd.initd
new file mode 100755
index 000000000000..49138f781648
--- /dev/null
+++ b/main/busybox-initscripts/ntpd.initd
@@ -0,0 +1,13 @@
+#!/sbin/runscript
+
+name="busybox $SVCNAME"
+command="/usr/sbin/$SVCNAME"
+command_args="${NTPD_OPTS:--N -p pool.ntp.org}"
+pidfile="/var/run/$SVCNAME.pid"
+
+depend() {
+	need net
+	provide ntp-client
+	use dns
+}
+
-- 
1.9.0



---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---
Natanael Copa
Details
Message ID
<20140319130800.7f067897@ncopa-desktop.alpinelinux.org>
In-Reply-To
<1395059980-31262-1-git-send-email-eivind@uggedal.com> (view parent)
Sender timestamp
1395230880
DKIM signature
missing
Download raw message
On Mon, 17 Mar 2014 12:39:40 +0000
Eivind Uggedal <eivind@uggedal.com> wrote:

> Replaces openntpd init script and conf with the same
> name.
> ---
>  main/busybox-initscripts/APKBUILD   | 16 +++++++++++-----
>  main/busybox-initscripts/ntpd.confd |  2 ++
>  main/busybox-initscripts/ntpd.initd | 13 +++++++++++++
>  3 files changed, 26 insertions(+), 5 deletions(-)
>  create mode 100644 main/busybox-initscripts/ntpd.confd
>  create mode 100755 main/busybox-initscripts/ntpd.initd

There was checksum failure which i just fixed (after ask on IRC)

Applied. Thanks!

-nc


---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---