main/openrc: init.d script cleanups and fixes for lxc

ref #3699

The following services should not be started on LXC:
- hwdrivers
- keymaps
- modloop
- modules

6 files changed, 21 insertions, 21 deletions

diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD
index 9c13edbf83..35cd4901f5 100644
--- a/main/openrc/APKBUILD
+++ b/main/openrc/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=openrc
 pkgver=0.15
 _ver=${pkgver/_git*/}
-pkgrel=0
+pkgrel=1
 pkgdesc="OpenRC manages the services, startup and shutdown of a host"
 url="http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git"
 arch="all"
@@ -73,11 +73,11 @@ c2af5e52da614a6cef02d1e4d537e360  swap-umount-tmpfs.patch
 1c426b84d13a725ad493647b5253f239  swap-ifexists.patch
 679c559aa54f9e855cd735866eeaaad6  hide-migrate-to-run-error.patch
 2c9cf86959b9e51e662036b4e716617e  hostname.initd
-bc3537cff5e623a0a2731bf5a27602d3  hwdrivers.initd
-db9b69807cef50beb26b0e4867007394  keymaps.initd
-3190533677d622eeb3e6ced4a17bd783  modules.initd
-094d5354b06c0ef37abbcfa4c8ee1447  modloop.initd
-8e03292b9d1c640698a8f836138f284b  networking.initd
+887eba592d487d6ffe2b42cfcd2813df  hwdrivers.initd
+41974f5408fd2e92892f891b58f2e49f  keymaps.initd
+0fe1b117960c2d6cee3b3fe40e5d2c76  modules.initd
+a76e20fe5abea4449ed4e560a11334a4  modloop.initd
+27c22aa4e5cdba499ac9a0b6b9385f7d  networking.initd
 c1ec888202d868710b5749f7b217d1e3  modloop.confd"
 sha256sums="c580bfed8b79bd608abdcb4a6458f3b1fe71d1275d0ddae66d8b3f04d66ba0c1  openrc-0.15.tar.gz
 c807aed11d7eb42de5c421a6d117532f6215697f159f40cb3404bdc80270bee1  openrc-0.4.3-mkmntdirs.patch
@@ -87,11 +87,11 @@ e869e2076c10a7134f5d9e4ae4a5d09ca35c6333d400556f1e329170d2e58066  0001-Force-roo
 8978b00492d90b573f5254cc394582e8f1a5cd8b4d6c928fa0a9a022dd17fe9c  swap-ifexists.patch
 786580df90a5a75087e5adfd395d160dee2df4b994e0938e8524198aeaf2d774  hide-migrate-to-run-error.patch
 e23db45e9399dab96d6c922af6c0cd6c243bbcc43756c845b70a9c7222a96313  hostname.initd
-5ea3067466c9d2f034cbc77fcfa398bd055693ce4c46a06fc3e7a5797b9207c5  hwdrivers.initd
-5fa99516604f44a2d4de717ea0b86f7d8b03c72b484929f3953c19b91e2d6c72  keymaps.initd
-1701490c50be0e367dba05664be5a69a51e60ea8b4cf57703e9859a0c1ce12f6  modules.initd
-eff2d8609c1aed248945207562db80e107caf1646485556c4dac8e4c8a3c4e8e  modloop.initd
-80b65bbf89d426b2f1bec5a4d75cadbc102e4484220c6b98d1258a0e90ccb280  networking.initd
+6cb4d9ea3ad562bcf2697f61f5a76a10481d23f5dead570f82eff576eaca5236  hwdrivers.initd
+32562d39ade4092df8163c2e8cf0b31eeec06aa5713d343e1c487bfa6d9f7c84  keymaps.initd
+74de22fda1386a3df5ac7112e26d347aa2d2eb213308116d9ea778a808e44e96  modules.initd
+61fb9e41c28f3632cc47e4ebd12fa856d0f80803aca1cd3446de3522829f308f  modloop.initd
+66151b5cc199485ddd188528a0f22f081994721f04c15b33df38f41a5d08ea78  networking.initd
 a5a0316cd59f5401b1d789bb466c98186201277ba6f014017b14965fcc10c254  modloop.confd"
 sha512sums="f291c07dd360017961b86f7363afb1212c98432c7beedc548935c30102a006be862d37b1a04326316d3b9eacde30804f2f956c3719b53e481461da0469dc672d  openrc-0.15.tar.gz
 eee27fbf72776fb70d3aa6c6464180731d522191e5755aa431ab09ea11dd11bf001a95618adcaa5ccc08455268003ca2917b2bff31adc9894214221c469a97db  openrc-0.4.3-mkmntdirs.patch
@@ -101,9 +101,9 @@ eee27fbf72776fb70d3aa6c6464180731d522191e5755aa431ab09ea11dd11bf001a95618adcaa5c
 c5b8806c693b0ea48ff87e0e3669304f5c2f95954ad54814889047a933f367081a8c8d3bb771dd1ed6c3bc845df894232bd6b662066d09eba3abf3964187d1d1  swap-ifexists.patch
 750e3305913d3f6fa6baa0b34b851fe17aacb922e864b95ec9b4b451e8e3c16d0c10686a12f4c7cb9b5d05894e1d89b0dac3beed19b1223d3fbc672f25769145  hide-migrate-to-run-error.patch
 a6e2b44dd548a2470971a44b61ddaaec037438050fe3411b4ea3fe5d36e9ad4cf5b5e226f8d4aacb8f3a4535bb3f2090608275abd76a30de33eb3fadaefad5fd  hostname.initd
-91dcb2786a7c02109959adc7d60df7a159d567ef93ff405b807b8060d51c1f88d58eacfb6ab4872f1c71f6024ade03d7f0f3e094360e0322d26102812ff00500  hwdrivers.initd
-5cd8b54acfd75663a8246560526d5959fe45ff88ca7da66a392fab70fdb12ae0e4114582391d5498f230d9a97b5a1e7789c4720674243b17ceaf760bf34abc75  keymaps.initd
-e26141643cfebaf49cfbddecac7a1d17c830816eff61827c64930c8cc4a87c3b9323bbecaa3c602646f147679da1b6cb00f0d22491477d7b3ca02f3a9b717c96  modules.initd
-8947b4b14dd7709a7b4f7ee6b11b768614743cf646f4e8a40bc84ace7997f9daa6d503542e45599edfcd18af9366026a46f4180517949c9bad402b7b9cb167be  modloop.initd
-ffbf547280cdd53c6ba842ffc31ab7a9a0153ddcc4e29043d2cbccf709745a8c1080636ec569e7e2769eff787c8f02fdff7e754dfb15698301b2d7e654b323ac  networking.initd
+b51d95df7b692aaea3e14ed009d99b46b82500d505e2eeecb6a20136cee140aea4a7377a65ccc5c51fff64be7a50666be48616d179888eaeff9d35178a7a772b  hwdrivers.initd
+584ecbbcecb284527d7616790b6e337ace610e4b3cedf2993eca294bfbef54674aeaee3078b6c17d746a0c48b5a64a813c3534136915947e6f62a6fa206cd3ca  keymaps.initd
+d70fb144b6d4c60d7f977392be73929c3d4f24b5ee5f09340f15ce339523b6a8d87132b5e2a9c1f579c0bedbba96d407222fbb37776b1737863a00134e1d1106  modules.initd
+992fbeded59679963a8d0154415c44949c7cd9719d85190ff57b3cf9db00c1daac090e1f45580cbf446e4d8fb65d21209d529e5709eb27ea2ecc31d75245f969  modloop.initd
+9aeba2c5cae539f16185b82c6e6e84c1b044e838749b92e8994172296d86ec3f1c674d62d54db1e08a8191e513ddb0ab3509f50ccae6cb5d7ba5ff5a5b6abb46  networking.initd
 aa702a7da8e6c0e5d8738febaf6b4e4cb021b30ce5c1809b530abf2b36739079446b16fc054740da8d86ed099942cf5deed6597cedb64c058f3def587a8b4689  modloop.confd"
diff --git a/main/openrc/hwdrivers.initd b/main/openrc/hwdrivers.initd
index 2efe52a4a6..eda9b65810 100644
--- a/main/openrc/hwdrivers.initd
+++ b/main/openrc/hwdrivers.initd
@@ -4,7 +4,7 @@ depend() {
 	need sysfs dev
 	before checkfs fsck
 	after modloop
-	keyword novserver
+	keyword -vserver -lxc
 }
 
 # Load hardware drivers
diff --git a/main/openrc/keymaps.initd b/main/openrc/keymaps.initd
index d90651964c..24d1e87778 100644
--- a/main/openrc/keymaps.initd
+++ b/main/openrc/keymaps.initd
@@ -5,7 +5,7 @@ description="Applies a keymap for the consoles."
 depend()
 {
 	need localmount
-	keyword noopenvz noprefix nouml novserver noxenu
+	keyword -openvz -prefix -uml -vserver -xenu -lxc
 }
 
 start() {
diff --git a/main/openrc/modloop.initd b/main/openrc/modloop.initd
index 9e094b75dd..2e7331be11 100644
--- a/main/openrc/modloop.initd
+++ b/main/openrc/modloop.initd
@@ -5,7 +5,7 @@
 depend() {
 	need dev
 	before checkfs fsck hwdrivers modules hwclock
-	keyword novserver nolxc
+	keyword -vserver -lxc
 }
 
 # read kernel options
diff --git a/main/openrc/modules.initd b/main/openrc/modules.initd
index 8c4ff48867..7c85eec9aa 100644
--- a/main/openrc/modules.initd
+++ b/main/openrc/modules.initd
@@ -5,7 +5,7 @@ description="Loads a user defined list of kernel modules."
 depend()
 {
 	before hwclock hwdrivers
-	keyword noopenvz noprefix novserver
+	keyword -openvz -prefix -vserver -lxc
 }
 
 
diff --git a/main/openrc/networking.initd b/main/openrc/networking.initd
index b01c86ca3a..998b2079d6 100644
--- a/main/openrc/networking.initd
+++ b/main/openrc/networking.initd
@@ -15,7 +15,7 @@ depend() {
 	need localmount
 	after bootmisc hwdrivers modules
 	provide net
-	keyword nojail noprefix novserver
+	keyword -jail -prefix -vserver
 }
 
 # find interfaces we want to start