main/busybox-initscripts: cleanup and fix lxc

Use keyword -<sys> instead of no<sys> to disable services on given
systems.

On LXC, disable acpid, klogd, mdev-mount, mdev and rdate.

fixes #3699

6 files changed, 24 insertions, 18 deletions

diff --git a/main/busybox-initscripts/APKBUILD b/main/busybox-initscripts/APKBUILD
index d252fadaf..66d094386 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=26
+pkgrel=27
 pkgdesc="Init scripts for busybox daemons"
 url="http://git.alpinelinux.org/cgit/aports/tree/core/busybox-initscripts"
 arch="noarch"
@@ -51,16 +51,16 @@ EOF
 
 }
 
-md5sums="c2f0c061fdd17008c8f1579237205684  acpid.initd
+md5sums="f3a3ccbd527e8c359ec285a39a805d47  acpid.initd
 59c39d2ba5c22fc311a19750298a03f2  cron.initd
 47f2931fdf09558a5cc0fdb1cde2f814  dnsd.initd
 bdb6830041b77db4a3de3b35ed326d5e  httpd.initd
 12fffa82b698267240acd4bdaa4861da  inetd.initd
-74207e2032d33879853d32536ecef306  klogd.initd
-f1651caf2fd5136a3f929baa294ab762  mdev-mount.initd
-17b3b5a427b24698a7d058e92d6e5c8f  mdev.initd
+96d5eb83477a8adc007a0ac4aedc0e61  klogd.initd
+756172d742b5d3e0877cf6396a9aaf20  mdev-mount.initd
+3998e1d4d0a55b64af058d66861010f7  mdev.initd
 88ac156aa6cc3999805d526498765d07  ntpd.initd
-a24e2d0c47d1c47d1dfa7ed91e6f0a21  rdate.initd
+e70b6427fb7b52f49801bcdfb99db3a2  rdate.initd
 763ef3ade65e24d89fe980651abfc915  syslog.initd
 4894514fb7e4485d6520290c9fa11a30  watchdog.initd
 8ddb8d040c9c7a32c63039a2c80ff496  cron.confd
@@ -76,16 +76,16 @@ daf57f3d0372f825ddc05b00973e5afe  usbdev
 30b0c85956b6701caf55309a17e537f6  usbdisk_link
 826d85313ca7a4a0205d63bd58b7d01f  xvd_links
 e2d8c224cf7a300ea826bfb40e25db54  default.script"
-sha256sums="078c1c0910133182a8c9f2e0f59468735414ff3b55a95fa92045e98ea4ff05d9  acpid.initd
+sha256sums="fdbe60ce1855fb65a8b3a157da454001d7db5b77aa8c5eee19840b0c3dd1ee61  acpid.initd
 d80bc50815de5cb58df53d969ccf682f3c34b62f1815830dc16e8813d7f0423c  cron.initd
 26b7af7288089e8462db062c0644c8a66855d6bd0eaa7edd2a3a43b3655c7da8  dnsd.initd
 010542f0718fcbc42273068dfc88d3518c919a73576b9ffab4795a6d36ce3f40  httpd.initd
 53ddd392736957d6a36157c190e0428fbb0c3a27925c63df8188f3461e74410d  inetd.initd
-4f52858fbab9a80b884a442dfba1249bbf93e9cf1a1ba28cea60fb124b1b5da2  klogd.initd
-b389eae20c49e71c9521de7b894da243bb508382f3d2d13c05586320c1c1092d  mdev-mount.initd
-7afc270bae5a515dac038ec871faa29de1c45a6897a2785de9a746c796c76cf3  mdev.initd
+9b90176cb12a1b3a7a558ac3c03ba445409979c04e142c6f5aba8a5f10ea0c83  klogd.initd
+59168724e5ec89d5492b9abc77e8aa28f7816af35cdef1fbae78589d1cc1db0c  mdev-mount.initd
+33b34ad1df2605ca2e0d4a91dfcafbb725ad7f0443df34d30d09f70e5b928337  mdev.initd
 4a32eea4da1e9eaf6c5ecfce20a297b55de3a1d479bc0578286d769be0114a7b  ntpd.initd
-99260e550e634108fb51ea44caef41aebe472cb4598b7e3a9e71cd1c7dcff5ba  rdate.initd
+0c6eb4dc269386472f475cf9c549ba53b73aa33f044fbfb3b6bc6dd2574bb341  rdate.initd
 36ec4261992bc72ee8b037ee1446b74f8a488e89bd23a112bc3b5b34a2c27377  syslog.initd
 03c1a6312598aeea5d10195ff5473ecc8ee89182b8115a8b5ad529259c0ea564  watchdog.initd
 6b466c5b0e9cab7613aa56edf383e891c5c7e26ee00467e9f7913808be23a328  cron.confd
@@ -101,16 +101,16 @@ dcb0c37590019bccb4c31a5372cbf7728eae6f1174d56bf0708d7504243a5fbb  usbdev
 4957f6991e0cb988b263b5276b582f1757deecad19cddebe3c615b381df9f858  usbdisk_link
 86ed99205050a5dcca8a27c7e8658df8c55dc85ed810db0d64b51f7c63aa140e  xvd_links
 f81b6a0f04cecd131f6372ce27fdb7d2bbb9155ce2cc333c8374dfd70537b901  default.script"
-sha512sums="e122e0982534f3bd3121be83c92fa16c40e15343bd09ff367c630cca75f8350e650db7ed97c1a808185938ba6fe97a65da90a2266be4188c023af4993bd4dd55  acpid.initd
+sha512sums="8663ffab45498f9626c6a023a28be6533a74be2ecaf746e8c1fb7b8092e77d8734da60691be953b0d2298c563398e72c255372d3ca3f601fd0b28f15342bd909  acpid.initd
 1499c3ad3b0d6adb49b7dab8a0d7a4d465f208ac0aedcd72845d80d1ee508a07142483d9c7eb1b4936d6557c5fc6c3b69ca356a84545bf0b71e9f6b51fac04e2  cron.initd
 82c70082fa6e00c389982e16b0ef92f8f137941517a2b74de57150f4645d8b8b2a91abaa22d5aede8f7d08e0749ef14a07860cf16f96058b96f4246a6c39222a  dnsd.initd
 66bfd7d2a03f4e8a50f08b7057091bfef8e36001eb7c07574ec45da6d75db05a88ae37dbd51e3e3fc7b00a784bf69f8416682ce0454ca16cc072358abdf4d2ce  httpd.initd
 82fb2ed926e7fbd87f3df7aba556ccb27ddd1fbd79e823acf00aea4ac41c5c5bf58dbf9488dd10b268371b40994a3cca9e305c1177a1628f72b9a1d3ebce0702  inetd.initd
-72f2267ccd7ab0a6bf9fe6bf9b6d403fbda490a8df396387dfa4da0b93f4bcdcd375f695f9cf4b83918c9304328090c4ef9524c1079123a6af5c2eeba74c758f  klogd.initd
-d10747bede68ac4dacf485f893820ccb65f2caff4c437412bc161cf0b0f34dbf4c23c900059de0ff746a77e2674ee31d94645a247f8e88338702a3a779c75b5e  mdev-mount.initd
-82dc1e78a4e4e5e5f2bd1efffc6645cb168ef1551bce4289dc189eaf215226d670735826f38af6bf43ad311110a9fa416d735bdb43eb4cef734b813d45786060  mdev.initd
+664c4ccfb0c10f450c9acda97a442590d06fc36bf1c7b208e0cb6f3f9c57e47935dfa9151aced8aaab2946d9658f2f9f57b5d3cca5296ce4a0e0c1268af74cea  klogd.initd
+911f03015ac88697b23d245c65afeaafadb34f79635810706b5dba727d5f7eb2c1d793cdd423a53d935f4b2e42e450c9f6b73e46ba3a937125c73af0be2c510d  mdev-mount.initd
+7ddb962910238c24439848da345e5449525815fe6b911d589821dac9167f8e1c05a1f6a6e27f439c887e45594735d1ba91f7935047cc8feec62537a3804442f2  mdev.initd
 c30d3936e045c01fdc9d1e9d1c0d2cd79b6dabb453400f067bc4eefa239a41c98bbe3fcd3ae53792e0e6d8fcf4aebc727e4524ec3ccd5741d5659a0a351c1c7e  ntpd.initd
-297c941a3e2bc57885733b82b12291227e8ba9f057e585c38650545a8217689e200d4607656d819d03e3d0a9e27d0b182d26e51a47950181155ec07e565c145d  rdate.initd
+a95d03564712803fc58c48534f2fbbf23dd8418ffd3a6a06f840e969627892eea518b4fe17f059850665fc056cedf972c26aee52c309805987fb5c59a710bd30  rdate.initd
 683fe4180dbbca2fbcf56680b0434f0783db000fda9298f48b9ec268ad20b0cf21813cfb19eaad2c52f7a7f7246e9f88e0f06dbd8d14360f5406c87bd8665b04  syslog.initd
 0a4f989068f00dd8599433ea1fe0713c405ed871750b918e32db2d6bccefc8b870ea2e16864d1b7c3dd57d63e04b41aa0bf9c882c1a9e8108def141d12072e90  watchdog.initd
 49c4299eca93517f09c6af71dd6bf737fec4006dfbf72b696fc3ec3e39d61fdd63107cae1bd883b2539848d52e6f6b1ed494d0c871e92e50fc55669295f3585e  cron.confd
diff --git a/main/busybox-initscripts/acpid.initd b/main/busybox-initscripts/acpid.initd
index 72c40ed50..a8daccfa1 100644
--- a/main/busybox-initscripts/acpid.initd
+++ b/main/busybox-initscripts/acpid.initd
@@ -8,5 +8,6 @@ pidfile="/var/run/acpid.pid"
 depend() {
 	need dev localmount
 	after hwdrivers modules
+	keyword -vserver -lxc
 }
 
diff --git a/main/busybox-initscripts/klogd.initd b/main/busybox-initscripts/klogd.initd
index 79354931b..e476da448 100644
--- a/main/busybox-initscripts/klogd.initd
+++ b/main/busybox-initscripts/klogd.initd
@@ -8,5 +8,5 @@ pidfile="/var/run/klogd.pid"
 depend() {
 	need clock hostname localmount
 	before net
-	keyword novserver
+	keyword -vserver -lxc
 }
diff --git a/main/busybox-initscripts/mdev-mount.initd b/main/busybox-initscripts/mdev-mount.initd
index 1d515d9a6..b5c43715e 100644
--- a/main/busybox-initscripts/mdev-mount.initd
+++ b/main/busybox-initscripts/mdev-mount.initd
@@ -7,6 +7,10 @@
 
 description="Mount tmpfs on /dev"
 
+depend() {
+	keyword -vserver -lxc
+}
+
 mount_dev_directory()
 {
 	if [ "$(mountinfo -t /dev)" = "mdev" ]; then
diff --git a/main/busybox-initscripts/mdev.initd b/main/busybox-initscripts/mdev.initd
index ef9df98a5..b10df2ecc 100644
--- a/main/busybox-initscripts/mdev.initd
+++ b/main/busybox-initscripts/mdev.initd
@@ -4,7 +4,7 @@ depend() {
 	provide dev
 	need sysfs mdev-mount
 	before checkfs fsck
-	keyword novserver
+	keyword -vserver -lxc
 }
 
 start() {
diff --git a/main/busybox-initscripts/rdate.initd b/main/busybox-initscripts/rdate.initd
index bed91d5de..708429f17 100644
--- a/main/busybox-initscripts/rdate.initd
+++ b/main/busybox-initscripts/rdate.initd
@@ -3,6 +3,7 @@
 depend() {
 	need net
 	after firewall
+	keyword -vserver -lxc
 }
 
 start() {