Subject: [alpine-aports] [PATCH] main/busybox-initscripts: rename cron service to crond

From: Sören Tempel <[email-masked]>
Date: Sat, 5 Mar 2016 15:12:50 +0100

cron is the name of a virtual service and a real service. This causes a
non-fatal error with the most recent OpenRC version.

Renaming the busybox cron service fixes this error, however, this breaks
backwards compatibility.
---
 main/busybox-initscripts/APKBUILD    | 18 +++++++++---------
 main/busybox-initscripts/cron.confd  |  3 ---
 main/busybox-initscripts/cron.initd  | 11 -----------
 main/busybox-initscripts/crond.confd |  2 ++
 main/busybox-initscripts/crond.initd | 11 +++++++++++
 5 files changed, 22 insertions(+), 23 deletions(-)
 delete mode 100644 main/busybox-initscripts/cron.confd
 delete mode 100644 main/busybox-initscripts/cron.initd
 create mode 100644 main/busybox-initscripts/crond.confd
 create mode 100644 main/busybox-initscripts/crond.initd

diff --git a/main/busybox-initscripts/APKBUILD b/main/busybox-initscripts/APKBUILD
index c8ede54..e8f0922 100644
--- a/main/busybox-initscripts/APKBUILD
+++ b/main/busybox-initscripts/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <[email-masked]>
 pkgname=busybox-initscripts
 pkgver=2.3
-pkgrel=4
+pkgrel=5
 pkgdesc="Init scripts for busybox daemons"
 url="http://git.alpinelinux.org/cgit/aports/tree/core/busybox-initscripts"
 arch="noarch"
@@ -12,9 +12,9 @@ makedepends=""
 install=$pkgname.post-install
 subpackages=""
 replaces="alpine-baselayout openntpd"
-source="acpid.initd cron.initd dnsd.initd httpd.initd inetd.initd klogd.initd
+source="acpid.initd crond.initd dnsd.initd httpd.initd inetd.initd klogd.initd
 	mdev.initd ntpd.initd rdate.initd syslog.initd udhcpd.initd
-	watchdog.initd cron.confd klogd.confd ntpd.confd rdate.confd syslog.confd
+	watchdog.initd crond.confd klogd.confd ntpd.confd rdate.confd syslog.confd
 	watchdog.confd mdev.conf dvbdev ide_links usbdev usbdisk_link xvd_links
 	default.script
 	"
@@ -48,7 +48,7 @@ EOF
 }
 
 md5sums="22c4509243f68873c2c89505cbb509a4  acpid.initd
-59c39d2ba5c22fc311a19750298a03f2  cron.initd
+629c36d84be6ba8c7f1a46411e8617af  crond.initd
 47f2931fdf09558a5cc0fdb1cde2f814  dnsd.initd
 bdb6830041b77db4a3de3b35ed326d5e  httpd.initd
 12fffa82b698267240acd4bdaa4861da  inetd.initd
@@ -59,7 +59,7 @@ e70b6427fb7b52f49801bcdfb99db3a2  rdate.initd
 dc1e27daaeac5a14619b4352b3ab44cd  syslog.initd
 9c6b8973cb8407eb5ac32a9b6fc78e64  udhcpd.initd
 4894514fb7e4485d6520290c9fa11a30  watchdog.initd
-8ddb8d040c9c7a32c63039a2c80ff496  cron.confd
+83bf1e56c1454634f6d2b9e7945e6a0f  crond.confd
 60bc14cc3163d76f41bcc93dc0f9984b  klogd.confd
 779058fe16d8a476c165b6d0928408b3  ntpd.confd
 22adbf155ffc4595206ded6daad07812  rdate.confd
@@ -73,7 +73,7 @@ daf57f3d0372f825ddc05b00973e5afe  usbdev
 826d85313ca7a4a0205d63bd58b7d01f  xvd_links
 e2d8c224cf7a300ea826bfb40e25db54  default.script"
 sha256sums="c92c6f91d56de0e7ac7189a85c6bb0f054199acc2b18258f4c7e0939d352b8b0  acpid.initd
-d80bc50815de5cb58df53d969ccf682f3c34b62f1815830dc16e8813d7f0423c  cron.initd
+182bddd5097daf3995c4eceec38cf9ab758f271b3e65d6b0f8a67f1281c8de19  crond.initd
 26b7af7288089e8462db062c0644c8a66855d6bd0eaa7edd2a3a43b3655c7da8  dnsd.initd
 010542f0718fcbc42273068dfc88d3518c919a73576b9ffab4795a6d36ce3f40  httpd.initd
 53ddd392736957d6a36157c190e0428fbb0c3a27925c63df8188f3461e74410d  inetd.initd
@@ -84,7 +84,7 @@ e08f595cb22ad4aef4d48deabb933067407a4b94be131d078ebd715fd7e380d3  mdev.initd
 1efcdf984e58f5d98f8c9f43bf906339e9764a5b50423e16729ebb3321c197d1  syslog.initd
 3a2c7b3a7b3fa6aa68096a0c978c6cd3e068f0f67ce4905a143fad5eb3c9b3c8  udhcpd.initd
 03c1a6312598aeea5d10195ff5473ecc8ee89182b8115a8b5ad529259c0ea564  watchdog.initd
-6b466c5b0e9cab7613aa56edf383e891c5c7e26ee00467e9f7913808be23a328  cron.confd
+d058d9ed0824f877b4e88158fe25d71ad76fca4b71542c4c6d7991ee2ecd20f8  crond.confd
 f6cd63d6e5f384dcb01a4906c9a0b6c5923794380235dfe0d79b48a686b03c5d  klogd.confd
 4224e5c6b5ffeb815c15f3e9f17ddaa169d4e6b7da169dbd0939fe06dbe8914d  ntpd.confd
 791d49802395861a5f788dc7436c1260ec2cd3bdea0c790952ae1b2dd518e811  rdate.confd
@@ -98,7 +98,7 @@ dcb0c37590019bccb4c31a5372cbf7728eae6f1174d56bf0708d7504243a5fbb  usbdev
 86ed99205050a5dcca8a27c7e8658df8c55dc85ed810db0d64b51f7c63aa140e  xvd_links
 f81b6a0f04cecd131f6372ce27fdb7d2bbb9155ce2cc333c8374dfd70537b901  default.script"
 sha512sums="dd548670114a92404b8e35fb915fdbe5994498b05b0a418583271c3dd72fb7800950e42c095c902a014eb198c046b8a346d43dccd8e7a158048ae33767c572ed  acpid.initd
-1499c3ad3b0d6adb49b7dab8a0d7a4d465f208ac0aedcd72845d80d1ee508a07142483d9c7eb1b4936d6557c5fc6c3b69ca356a84545bf0b71e9f6b51fac04e2  cron.initd
+c9d0fb0f8cc27d661d3b4e58c56eb598ca368890576e18ffffd42efdf68ba35537656be9be319b2e2818aa0152d3ca8611bece2433512fbfcd4eed7988765549  crond.initd
 82c70082fa6e00c389982e16b0ef92f8f137941517a2b74de57150f4645d8b8b2a91abaa22d5aede8f7d08e0749ef14a07860cf16f96058b96f4246a6c39222a  dnsd.initd
 66bfd7d2a03f4e8a50f08b7057091bfef8e36001eb7c07574ec45da6d75db05a88ae37dbd51e3e3fc7b00a784bf69f8416682ce0454ca16cc072358abdf4d2ce  httpd.initd
 82fb2ed926e7fbd87f3df7aba556ccb27ddd1fbd79e823acf00aea4ac41c5c5bf58dbf9488dd10b268371b40994a3cca9e305c1177a1628f72b9a1d3ebce0702  inetd.initd
@@ -109,7 +109,7 @@ a95d03564712803fc58c48534f2fbbf23dd8418ffd3a6a06f840e969627892eea518b4fe17f05985
 9b14071313a9d63344c68f15c829be8189514daf5821dab34e0789ad60280c0d1ca84e23da6c91555003b9b998d148743da3b8719c67ebe3845b43eec911ebd3  syslog.initd
 1d4574ec7cc6d7e9952bb50b4fcb10a910868688da03a25aede492835313c686247bde1faa17f50243d61a93bfc1d8fa54cf821d7be908581e365b0f1b6a5588  udhcpd.initd
 0a4f989068f00dd8599433ea1fe0713c405ed871750b918e32db2d6bccefc8b870ea2e16864d1b7c3dd57d63e04b41aa0bf9c882c1a9e8108def141d12072e90  watchdog.initd
-49c4299eca93517f09c6af71dd6bf737fec4006dfbf72b696fc3ec3e39d61fdd63107cae1bd883b2539848d52e6f6b1ed494d0c871e92e50fc55669295f3585e  cron.confd
+34c6f3197064bb91619b899b28a201bd4d920b18bded3845440b2cb36dc6f16cabf447c96878349b16e46c30184cbe48bac00a01c5f7cf1be038c0b7136064c5  crond.confd
 f9bf43b72142bbb4c0665c1268a3d91586ef8a057dfe64c53b6923815d2db1f669b8080a38311ad89cda0b783a8628700fc5414d834a21d8e48515760bb910f7  klogd.confd
 b0ba67585f39d83320ed6de183d7463a0e163807b9f3dc6f0baa212236056f22aeb2c5399dfdcd54929eb5ae06a15714c2fed133b5888869ed9d9cf589cef843  ntpd.confd
 3d6c4d358e226e0c0462f2003bcf0b6787f91a53f4d6b6db5bfe7748bb0dd392d7cc454058ea8a9b649e8dd2629963a5ad1257c36af04367caeb1923f954daf7  rdate.confd
diff --git a/main/busybox-initscripts/cron.confd b/main/busybox-initscripts/cron.confd
deleted file mode 100644
index 2f2eb7b..0000000
--- a/main/busybox-initscripts/cron.confd
+++ /dev/null
@@ -1,3 +0,0 @@
-# enter the cron options
-CRON_OPTS="-c /etc/crontabs"
-
diff --git a/main/busybox-initscripts/cron.initd b/main/busybox-initscripts/cron.initd
deleted file mode 100644
index 5afb168..0000000
--- a/main/busybox-initscripts/cron.initd
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/sbin/openrc-run
-
-name="busybox cron"
-command="/usr/sbin/crond"
-pidfile="/var/run/crond.pid"
-command_args="$CRON_OPTS"
-
-depend() {
-	need localmount
-	need logger
-}
diff --git a/main/busybox-initscripts/crond.confd b/main/busybox-initscripts/crond.confd
new file mode 100644
index 0000000..542af1e
--- /dev/null
+++ b/main/busybox-initscripts/crond.confd
@@ -0,0 +1,2 @@
+# enter the cron options
+CRON_OPTS="-c /etc/crontabs"
diff --git a/main/busybox-initscripts/crond.initd b/main/busybox-initscripts/crond.initd
new file mode 100644
index 0000000..afaf384
--- /dev/null
+++ b/main/busybox-initscripts/crond.initd
@@ -0,0 +1,11 @@
+#!/sbin/openrc-run
+
+name="busybox $SVCNAME"
+command="/usr/sbin/$SVCNAME"
+pidfile="/var/run/$SVCNAME.pid"
+command_args="$CRON_OPTS"
+
+depend() {
+	need localmount
+	need logger
+}
-- 
2.7.2

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---