[gentoo-commits] proj/openrc:0.21.x commit in: init.d/

[William Hubbs]

commit:     61e211c1c4f51fdb8babb9a70ed7ce138d71c80b
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sun Jul 31 18:01:17 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 18:50:05 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=61e211c1

init.d: initial service adjustments for docker support

Add -docker keyword to the same scripts that have -lxc keyword.

 init.d/binfmt.in       | 2 +-
 init.d/consolefont.in  | 2 +-
 init.d/devfs.in        | 2 +-
 init.d/dmesg.in        | 2 +-
 init.d/fsck.in         | 2 +-
 init.d/hostname.in     | 2 +-
 init.d/hwclock.in      | 2 +-
 init.d/keymaps.in      | 2 +-
 init.d/localmount.in   | 2 +-
 init.d/modules.in      | 2 +-
 init.d/mount-ro.in     | 2 +-
 init.d/net-online.in   | 2 +-
 init.d/netmount.in     | 2 +-
 init.d/numlock.in      | 2 +-
 init.d/procfs.in       | 2 +-
 init.d/root.in         | 2 +-
 init.d/swap.in         | 2 +-
 init.d/swapfiles.in    | 2 +-
 init.d/swclock.in      | 2 +-
 init.d/sysfs.in        | 2 +-
 init.d/termencoding.in | 2 +-
 init.d/urandom.in      | 2 +-
 22 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/init.d/binfmt.in b/init.d/binfmt.in
index 39978a0..4afb83b 100644
--- a/init.d/binfmt.in
+++ b/init.d/binfmt.in
@@ -15,7 +15,7 @@ depend()
 {
 	after procfs
 	use modules devfs
-	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
 start()

diff --git a/init.d/consolefont.in b/init.d/consolefont.in
index de2d448..9fe95af 100644
--- a/init.d/consolefont.in
+++ b/init.d/consolefont.in
@@ -15,7 +15,7 @@ depend()
 {
 	need localmount termencoding
 	after hotplug bootmisc modules
-	keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }
 
 start()

diff --git a/init.d/devfs.in b/init.d/devfs.in
index c869326..8038c54 100644
--- a/init.d/devfs.in
+++ b/init.d/devfs.in
@@ -15,7 +15,7 @@ depend()
 {
 	provide dev-mount
 	before dev
-	keyword -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -lxc -prefix -systemd-nspawn -vserver
 }
 
 mount_dev()

diff --git a/init.d/dmesg.in b/init.d/dmesg.in
index a3696d2..641f36f 100644
--- a/init.d/dmesg.in
+++ b/init.d/dmesg.in
@@ -14,7 +14,7 @@ description="Set the dmesg level for a cleaner boot"
 depend()
 {
 	before dev modules
-	keyword -lxc -prefix -systemd-nspawn -vserver
+	keyword -docker -lxc -prefix -systemd-nspawn -vserver
 }
 
 start()

diff --git a/init.d/fsck.in b/init.d/fsck.in
index 005e87f..7d12482 100644
--- a/init.d/fsck.in
+++ b/init.d/fsck.in
@@ -16,7 +16,7 @@ _IFS="
 depend()
 {
 	use dev clock modules
-	keyword -jail -openvz -prefix -systemd-nspawn -timeout -vserver -lxc -uml
+	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -timeout -vserver -uml
 }
 
 _abort() {

diff --git a/init.d/hostname.in b/init.d/hostname.in
index cc3d148..21ed701 100644
--- a/init.d/hostname.in
+++ b/init.d/hostname.in
@@ -12,7 +12,7 @@
 description="Sets the hostname of the machine."
 
 depend() {
-	keyword -prefix -systemd-nspawn -lxc
+	keyword -docker -lxc -prefix -systemd-nspawn
 }
 
 start()

diff --git a/init.d/hwclock.in b/init.d/hwclock.in
index 7fee7b7..2cd1ef3 100644
--- a/init.d/hwclock.in
+++ b/init.d/hwclock.in
@@ -35,7 +35,7 @@ depend()
 	else
 		before *
 	fi
-	keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }
 
 setupopts()

diff --git a/init.d/keymaps.in b/init.d/keymaps.in
index a9da423..dbe054a 100644
--- a/init.d/keymaps.in
+++ b/init.d/keymaps.in
@@ -15,7 +15,7 @@ depend()
 {
 	need localmount termencoding
 	after bootmisc
-	keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }
 
 start()

diff --git a/init.d/localmount.in b/init.d/localmount.in
index b7de0d8..d2c9321 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -16,7 +16,7 @@ depend()
 	need fsck
 	use lvm modules mtab
 	after lvm modules
-	keyword -jail -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
 }
 
 start()

diff --git a/init.d/modules.in b/init.d/modules.in
index 6ff90d6..ff1dee4 100644
--- a/init.d/modules.in
+++ b/init.d/modules.in
@@ -14,7 +14,7 @@ description="Loads a user defined list of kernel modules."
 depend()
 {
 	use isapnp
-	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
 start()

diff --git a/init.d/mount-ro.in b/init.d/mount-ro.in
index 49bfe62..589f1a2 100644
--- a/init.d/mount-ro.in
+++ b/init.d/mount-ro.in
@@ -14,7 +14,7 @@ description="Re-mount filesytems read-only for a clean reboot."
 depend()
 {
 	need killprocs savecache
-	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
 start()

diff --git a/init.d/net-online.in b/init.d/net-online.in
index 53855d9..3e18ba9 100644
--- a/init.d/net-online.in
+++ b/init.d/net-online.in
@@ -15,7 +15,7 @@ depend()
 {
 	after modules
 	need sysfs
-	keyword -jail -lxc -openvz -prefix -systemd-nspawn -uml -vserver
+	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -uml -vserver
 }
 
 get_interfaces()

diff --git a/init.d/netmount.in b/init.d/netmount.in
index ede4d32..7be08e1 100644
--- a/init.d/netmount.in
+++ b/init.d/netmount.in
@@ -24,7 +24,7 @@ depend()
 	want $mywant
 	use afc-client amd openvpn
 	use dns
-	keyword -jail -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
 }
 
 start()

diff --git a/init.d/numlock.in b/init.d/numlock.in
index 950b583..875ffc0 100644
--- a/init.d/numlock.in
+++ b/init.d/numlock.in
@@ -16,7 +16,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
 depend()
 {
 	need localmount
-	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
 _setleds()

diff --git a/init.d/procfs.in b/init.d/procfs.in
index b78afc7..de61873 100644
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -15,7 +15,7 @@ depend()
 {
 	use modules devfs
 	need localmount
-	keyword -openvz -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
 start()

diff --git a/init.d/root.in b/init.d/root.in
index 409a63c..ec22699 100644
--- a/init.d/root.in
+++ b/init.d/root.in
@@ -14,7 +14,7 @@ description="Mount the root fs read/write"
 depend()
 {
 	need fsck
-	keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
 start()

diff --git a/init.d/swap.in b/init.d/swap.in
index c6d705d..4fb2b35 100644
--- a/init.d/swap.in
+++ b/init.d/swap.in
@@ -12,7 +12,7 @@
 depend()
 {
 	before localmount
-	keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
 start()

diff --git a/init.d/swapfiles.in b/init.d/swapfiles.in
index f61c4ec..92b5c89 100644
--- a/init.d/swapfiles.in
+++ b/init.d/swapfiles.in
@@ -12,7 +12,7 @@
 depend()
 {
 	need localmount
-	keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc
+	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver
 }
 
 start()

diff --git a/init.d/swclock.in b/init.d/swclock.in
index b09afad..9ceba44 100644
--- a/init.d/swclock.in
+++ b/init.d/swclock.in
@@ -15,7 +15,7 @@ depend()
 {
 	before *
 	provide clock
-	keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 }
 
 # swclock is an OpenRC built in

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index cc4007f..6929810 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -15,7 +15,7 @@ sysfs_opts=nodev,noexec,nosuid
 
 depend()
 {
-	keyword -lxc -prefix -systemd-nspawn -vserver
+	keyword -docker -lxc -prefix -systemd-nspawn -vserver
 }
 
 mount_sys()

diff --git a/init.d/termencoding.in b/init.d/termencoding.in
index a739f97..9f33eb6 100644
--- a/init.d/termencoding.in
+++ b/init.d/termencoding.in
@@ -16,7 +16,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
 
 depend()
 {
-	keyword -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
+	keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
 	use root
 	after bootmisc
 }

diff --git a/init.d/urandom.in b/init.d/urandom.in
index 9f4350b..54706ac 100644
--- a/init.d/urandom.in
+++ b/init.d/urandom.in
@@ -15,7 +15,7 @@ description="Initializes the random number generator."
 depend()
 {
 	need localmount
-	keyword -jail -lxc -openvz -prefix -systemd-nspawn
+	keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn
 }
 
 save_seed()