testing/openvswitch: update init.d scripts

4 files changed, 65 insertions, 65 deletions

diff --git a/testing/openvswitch/APKBUILD b/testing/openvswitch/APKBUILD
index b271fccdd..f4bbfdc68 100644
--- a/testing/openvswitch/APKBUILD
+++ b/testing/openvswitch/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=openvswitch
 pkgver=1.11.0
-pkgrel=0
+pkgrel=1
 pkgdesc="an open virtual switch"
 url="http://openvswitch.org/"
 arch="all"
@@ -64,23 +64,23 @@ package() {
 }
 
 md5sums="81231a77dcd38181dbc1cb701e4fc9d0  openvswitch-1.11.0.tar.gz
-8cc7f62777212fab9fc1c8c506a32e65  ovsdb-server.initd
+b9b6b23d349d5563d70a1c6d0a5b677c  ovsdb-server.initd
 9c2c1d774be02f2e69609bcc4f24a370  ovsdb-server.confd
-4e6e5afd1dc2d3bc1043dab19cd9f61f  ovs-controller.initd
+1315fb5ed8b70ceec97f76206fa14849  ovs-controller.initd
 0f5ce60dda512b29d4e20cb832e062d4  ovs-controller.confd
-623db751bbdc390d9e9c076c0ce9a6b2  ovs-vswitchd.initd
+92f26091d52353bf248e9bdc332ad418  ovs-vswitchd.initd
 2d1e0111ea62779f49e14d62678294b2  ovs-vswitchd.confd"
 sha256sums="007d7d3f2deabe5a3845d1045d23b6b1de174497a8e436091541221dd71833da  openvswitch-1.11.0.tar.gz
-c598cf6d78e7343d1491bc303c4079e20b7687a9ff4f9fa501e62f925fd722f5  ovsdb-server.initd
+2a9a3bd0277362fcdab62b7ea86ae2e488e099d9ed724dc27648136e5f5ed93c  ovsdb-server.initd
 15c508d134fed8cda13e2d394fc7c20b9868294a30e73a952ebffd31df129251  ovsdb-server.confd
-4e83dd7990ae17752ebc45e6e1648258827fd7cbe900b68d2867860e30641b2c  ovs-controller.initd
+62eeaa3a5d53c2048201d894d5cd97df3b728a4e7cb5beb168a190c6cad111e0  ovs-controller.initd
 950996914d7991550ead5fcfb5b262c60b5f53df6796c111105baa2a89a39431  ovs-controller.confd
-14219de96680153d681254228ab47bfc00b0f8a2b79d7690a2d3bede7b64932b  ovs-vswitchd.initd
+ca809e55e4540b905aa2a1afea9624cd0a52c31d833db9ed2b57eb5a905f6058  ovs-vswitchd.initd
 cc189d5ca24708ff775a4de312df3f611c65714724b8901ec6527c9e3f22e14a  ovs-vswitchd.confd"
 sha512sums="9c338a9e376c845ae5f273030263dbae52fa268350d943e65987d6840d9647194f715e36517c829be32200f1064e13a585bd5b2acb9fa2a7f32199bd4be31459  openvswitch-1.11.0.tar.gz
-a57ce90d58a3d9a2b2ae9dd1e1b4f9565a1bf6e205882be98b60bc02f4481cf884e18e1b40f80a99e79e6eebee0f5fca2844915a2acf90218a9d351b71e85de6  ovsdb-server.initd
+4d031347b146cf82812cb0fc1ead944d6e29a9a8bd2afe603c4003b6f8c9d2f9d0c5f7e2ebdad456e7f5af4b01c756203cd96cc44db7be266bf94ac9bba188ff  ovsdb-server.initd
 a9aab68cf5188ebdff520e8ae1bc90018fab13fea5cf7c36dda42a4acdeb842de8344191f2f52213ea173a73e647fe48e7bd29ce6974c9bf3880d0f91a3713aa  ovsdb-server.confd
-b8f44f0ccbbafb5183acdebefb12b5fac3e3bd40a83fa70b7be2298ce95c58bd3eca38d7168785143a62730703bdde21adb4e56d330abfe3281d9118f4146c2e  ovs-controller.initd
+b48b9405c16dc117213071a32000f155c08cf7c4d28333090f7f5ba8871f7b4dddeec6908b34a97101a9d973dff69da773f0b941c92d330fd7cc3f282dfb0744  ovs-controller.initd
 e8f28b01a080d4ba11db7f17e61d4352241194e723fc198cc1c7ce60717be297025b892633599be3e1dc86dec525c1be41b9f22a5c06b8a4c267555195c92dc9  ovs-controller.confd
-aa37a7d6510399b90341673ea55ed0322a68d201ea722a508de1715559818abdeee4fa7983ff03487bba1ee7e54a195591f51be0b5df5fba89762fb9db2e94eb  ovs-vswitchd.initd
+d160ac8bf80e3b0e7cb7d434842950381b248e96bfdd00d9b6d0ae6c762dbbcd0f351739adf54e6b3f677e84a800ad62355d7f7771ff0a4965824744ea853f8f  ovs-vswitchd.initd
 346aea099f51707d2b4fc9fdc8c1502582723fb4e00c4d5d1624b0378c94dfb76674fa95e2af894f36169df52109dbe441ee6a45aa744584d9e4c74d15a46c1d  ovs-vswitchd.confd"
diff --git a/testing/openvswitch/ovs-controller.initd b/testing/openvswitch/ovs-controller.initd
index 554aebe3f..dea1f670b 100644
--- a/testing/openvswitch/ovs-controller.initd
+++ b/testing/openvswitch/ovs-controller.initd
@@ -1,24 +1,23 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/files/ovs-controller,v 1.1 2012/07/18 08:41:29 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/files/ovs-controller-r1,v 1.1 2013/04/08 19:37:58 dev-zero Exp $
 
-depend() {
-    need lo
-}
+description="Open vSwitch OpenFlow controller"
 
-start() {
-	checkpath -d "/var/run/openvswitch" -m 0750
+command="/usr/bin/ovs-controller"
+command_args="
+    --pidfile
+    --detach
+    --monitor
+    ${OPTIONS} ${METHODS}"
+pidfile="/var/run/openvswitch/ovs-controller.pid"
 
-	ebegin "Starting Open vSwitch OpenFlow controller"
-	start-stop-daemon \
-		--start --quiet --pidfile "/var/run/openvswitch/ovs-controller.pid" \
-		--exec /usr/bin/ovs-controller -- --pidfile --detach --monitor ${OPTIONS} ${METHODS}
-	eend $?
+depend() {
+    need net
+    use logger
 }
 
-stop() {
-	ebegin "Stopping Open vSwitch OpenFlow controller"
-	start-stop-daemon --stop --quiet --pidfile "/var/run/openvswitch/ovs-controller.pid"
-	eend $?
+start_pre() {
+	checkpath -d "/var/run/openvswitch" -m 0750
 }
diff --git a/testing/openvswitch/ovs-vswitchd.initd b/testing/openvswitch/ovs-vswitchd.initd
index eea20db54..6bf8bfc53 100644
--- a/testing/openvswitch/ovs-vswitchd.initd
+++ b/testing/openvswitch/ovs-vswitchd.initd
@@ -1,24 +1,22 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/files/ovs-vswitchd,v 1.2 2012/07/18 08:41:29 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/files/ovs-vswitchd-r1,v 1.1 2013/04/08 19:37:58 dev-zero Exp $
 
-depend() {
-	use ovsdb-server
-}
+description="Open vSwitch virtual switch"
 
-start() {
-	checkpath -d "/var/run/openvswitch" -m 0750
+command="/usr/sbin/ovs-vswitchd"
+command_args="
+    --pidfile
+    --detach
+    --monitor
+    ${OPTIONS} ${DATABASE}"
+pidfile="/var/run/openvswitch/ovs-vswitchd.pid"
 
-	ebegin "Starting Open vSwitch daemon"
-	start-stop-daemon \
-		--start --quiet --pidfile "/var/run/openvswitch/ovs-vswitchd.pid" \
-		--exec /usr/sbin/ovs-vswitchd -- --pidfile --detach --monitor ${OPTIONS} ${DATABASE}
-	eend $?
+depend() {
+	use ovsdb-server logger
 }
 
-stop() {
-	ebegin "Stopping Open vSwitch daemon"
-	start-stop-daemon --stop --quiet --pidfile "/var/run/openvswitch/ovs-vswitchd.pid"
-	eend $?
+start_pre() {
+	checkpath -d "/var/run/openvswitch" -m 0750
 }
diff --git a/testing/openvswitch/ovsdb-server.initd b/testing/openvswitch/ovsdb-server.initd
index 5eb5daf34..53c274453 100644
--- a/testing/openvswitch/ovsdb-server.initd
+++ b/testing/openvswitch/ovsdb-server.initd
@@ -1,32 +1,35 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/files/ovsdb-server,v 1.1 2012/06/27 08:49:34 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvswitch/files/ovsdb-server-r1,v 1.1 2013/04/08 19:37:58 dev-zero Exp $
 
-depend() {
-	need localmount
-}
+description="Open vSwitch database server"
 
-start() {
-	checkpath -d "/var/run/openvswitch" -m 0750
+remote_punix=${DB_SOCKET:+"--remote=punix:${DB_SOCKET}"}
+remote_db=${REMOTE_DB:+"--remote=${REMOTE_DB}"}
+private_key=${PRIVATE_KEY:+"--private-key=${PRIVATE_KEY}"}
+certificate=${CERTIFICATE:+"--certificate=${CERTIFICATE}"}
+bootstrap_ca_cert=${BOOTSTRAP_CA_CERT:+"--bootstrap-ca-cert=${BOOTSTRAP_CA_CERT}"}
 
-	local remote_punix=${DB_SOCKET:+"--remote=punix:${DB_SOCKET}"}
-	local remote_db=${REMOTE_DB:+"--remote=${REMOTE_DB}"}
-	local private_key=${PRIVATE_KEY:+"--private-key=${PRIVATE_KEY}"}
-	local certificate=${CERTIFICATE:+"--certificate=${CERTIFICATE}"}
-	local bootstrap_ca_cert=${BOOTSTRAP_CA_CERT:+"--bootstrap-ca-cert=${BOOTSTRAP_CA_CERT}"}
+command="/usr/sbin/ovsdb-server"
+command_args="
+    --pidfile
+    --detach
+    --monitor
+    ${remote_punix}
+    ${remote_db}
+    ${private_key}
+    ${certificate}
+    ${bootstrap_ca_cert}
+    ${DATABASE}
+    ${OPTIONS}"
+pidfile="/var/run/openvswitch/ovsdb-server.pid"
 
-	ebegin "Starting Open vSwitch DB server"
-	start-stop-daemon \
-		--start --quiet \
-		--pidfile "/var/run/openvswitch/ovsdb-server.pid" \
-		--exec /usr/sbin/ovsdb-server -- --pidfile --detach --monitor ${remote_punix} ${remote_db} ${private_key} ${certificate} ${bootstrap_ca_cert} ${DATABASE} ${OPTIONS} 
-	eend $?
+depend() {
+	need localmount
+    use logger
 }
 
-stop() {
-	ebegin "Stopping Open vSwitch DB server"
-	start-stop-daemon --stop --quiet --pidfile "/var/run/openvswitch/ovsdb-server.pid"
-	eend $?
+start_pre() {
+	checkpath -d "/var/run/openvswitch" -m 0750
 }
-