aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Cardall <developer@it-offshore.co.uk>2017-11-19 22:07:21 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2017-11-30 08:27:34 +0000
commitefcf0e4fa1ec88710194bf8e2863f2a9e2d7aa1e (patch)
tree514af6b475e122bf74614ad04cd2774ec3c2e903
parent90eb5fdd0911d6b4198ba7287fd01d716ed63fb3 (diff)
downloadalpine_aports-efcf0e4fa1ec88710194bf8e2863f2a9e2d7aa1e.tar.bz2
alpine_aports-efcf0e4fa1ec88710194bf8e2863f2a9e2d7aa1e.tar.xz
alpine_aports-efcf0e4fa1ec88710194bf8e2863f2a9e2d7aa1e.zip
main/openvswitch: fix ovs-modules initd
* openvswitch module cannot be removed without a reboot so do not unload it
-rw-r--r--main/openvswitch/APKBUILD4
-rw-r--r--main/openvswitch/ovs-modules.initd15
2 files changed, 7 insertions, 12 deletions
diff --git a/main/openvswitch/APKBUILD b/main/openvswitch/APKBUILD
index c023e249c3..89248448d2 100644
--- a/main/openvswitch/APKBUILD
+++ b/main/openvswitch/APKBUILD
@@ -2,7 +2,7 @@
2# Maintainer: Stuart Cardall <developer@it-offshore.co.uk> 2# Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
3pkgname=openvswitch 3pkgname=openvswitch
4pkgver=2.8.1 4pkgver=2.8.1
5pkgrel=1 5pkgrel=2
6pkgdesc="A production quality, multilayer virtual switch" 6pkgdesc="A production quality, multilayer virtual switch"
7url="http://openvswitch.org/" 7url="http://openvswitch.org/"
8arch="all" 8arch="all"
@@ -96,7 +96,7 @@ sha512sums="b9e90b49bb91aef80942b146e7e324b74f8961342dcc7836f2551ea976a69d66506a
96b1588d076bbfc7ef2dd46fce8e46186f40cbbc4667697f7ac13ddc68e34568fdab315fde47838de7f6d32916853190336cfe3735f672ad7cb624ae14dbff55a5 ovsdb-server.confd 96b1588d076bbfc7ef2dd46fce8e46186f40cbbc4667697f7ac13ddc68e34568fdab315fde47838de7f6d32916853190336cfe3735f672ad7cb624ae14dbff55a5 ovsdb-server.confd
974bff37f8bed32d5327b4b0433984ab8ffdce77f618034aa6ffd1ad4a7caa00703ea2bef312876dce5aafa4c17fe06dddd75e5c05c10e13bf8f5c3805a0654a96 ovs-vswitchd.initd 974bff37f8bed32d5327b4b0433984ab8ffdce77f618034aa6ffd1ad4a7caa00703ea2bef312876dce5aafa4c17fe06dddd75e5c05c10e13bf8f5c3805a0654a96 ovs-vswitchd.initd
98346aea099f51707d2b4fc9fdc8c1502582723fb4e00c4d5d1624b0378c94dfb76674fa95e2af894f36169df52109dbe441ee6a45aa744584d9e4c74d15a46c1d ovs-vswitchd.confd 98346aea099f51707d2b4fc9fdc8c1502582723fb4e00c4d5d1624b0378c94dfb76674fa95e2af894f36169df52109dbe441ee6a45aa744584d9e4c74d15a46c1d ovs-vswitchd.confd
99614c86eab826bb8f934cf4a98508fde9952a0b7211414e074510473af3455077a333729aa0e59f3634b9bf30d64847d0f7597246506c36a8f09d57573a2522fc ovs-modules.initd 991e08aa5ac6ce55b97256478b9243c8a4c92a42a97fc70ea0439c832b12a775af28a127224ae6c4ce01642dde65f76c610a44105912338bf443d8ea390c2d9ccf ovs-modules.initd
100c5f137bce28bf80c1e5a6ca18722dae9a5ecff03d20bf92642270951bbbb499e5fb05a08163442720e866d135fcd7426b88add0b42ed240d5f0c068aa9fcd9da musl-if_packet.patch 100c5f137bce28bf80c1e5a6ca18722dae9a5ecff03d20bf92642270951bbbb499e5fb05a08163442720e866d135fcd7426b88add0b42ed240d5f0c068aa9fcd9da musl-if_packet.patch
101973e1e188c23981114c5120d04cf39bec4597349d4c60056cc3834aa8148cd7bafea6216b0649db3dbd0ea540f8876bfaac90262e9a493abf2faf660c4dda01e 0002-fix-wait-any.patch 101973e1e188c23981114c5120d04cf39bec4597349d4c60056cc3834aa8148cd7bafea6216b0649db3dbd0ea540f8876bfaac90262e9a493abf2faf660c4dda01e 0002-fix-wait-any.patch
102eca5b19954e6df7dc17c582e22e4b27533710d077039a54a2ba291ae7d3a2706872f5bcad8795ca58e06ca7e45a9b8c4c51e99aedbabd0e87623972ebcdca230 ifupdown-alpine.patch 102eca5b19954e6df7dc17c582e22e4b27533710d077039a54a2ba291ae7d3a2706872f5bcad8795ca58e06ca7e45a9b8c4c51e99aedbabd0e87623972ebcdca230 ifupdown-alpine.patch
diff --git a/main/openvswitch/ovs-modules.initd b/main/openvswitch/ovs-modules.initd
index 86c205428a..e6695ac3cc 100644
--- a/main/openvswitch/ovs-modules.initd
+++ b/main/openvswitch/ovs-modules.initd
@@ -3,23 +3,18 @@
3MODULES="openvswitch" 3MODULES="openvswitch"
4 4
5depend() { 5depend() {
6 before ovsdb-server 6 before ovsdb-server
7} 7}
8 8
9
10start() { 9start() {
11 ebegin "Loading Openvswitch kernel modules" 10 ebegin "Loading Openvswitch kernel modules"
12 for mod in $MODULES; do 11 for mod in $MODULES; do
13 modprobe -q $mod 12 modprobe -q $mod
14 done 13 done
15 eend $? 14 eend $?
16} 15}
17 16
18stop() { 17stop() {
19 ebegin "Unloading Openvswitch kernel modules" 18 # modules cannot be removed without a reboot
20 for mod in $MODULES; do 19 return 0
21 rmmod $mod
22 done
23 eend $?
24} 20}
25