| リビジョン | 74d62499fc5d0f4d0669354257a3d599bc560f8f (tree) |
|---|---|
| 日時 | 2016-04-10 20:25:10 |
| 作者 | niwa-hideyuki <niwa.niwa@nift...> |
| コミッター | niwa-hideyuki |
Change in the processing of Opne vSwitch
src/Makefile (diff) src/driver/OpenvSwitch/br-del-all (diff) src/service/fulcon.service (diff)| @@ -202,6 +202,7 @@ install-dockerfile : | ||
| 202 | 202 | install-service : |
| 203 | 203 | mkdir -p $(DESTDIR)$(systemddir)/system |
| 204 | 204 | install -m 644 service/fulcon.service $(DESTDIR)$(systemddir)/system/fulcon.service |
| 205 | + install -m 644 service/fulcon.service $(DESTDIR)/lib/systemd/system/fulcon.service | |
| 205 | 206 | |
| 206 | 207 | install-doc : |
| 207 | 208 | mkdir -p $(DESTDIR)$(libdir)/fulcon/doc |
| @@ -2,17 +2,19 @@ | ||
| 2 | 2 | |
| 3 | 3 | # Copyright (C) 2016 NIWA Hideyuki |
| 4 | 4 | |
| 5 | -BR=`ovs-vsctl show | sed -e 's/"//g' | \ | |
| 6 | - awk '{ \ | |
| 7 | - if($1=="Bridge" && $2~/^fulcon/)print $2 \ | |
| 8 | - }'` | |
| 5 | +br-brif-list | awk '{ \ | |
| 6 | + for(i=2;i<=NF;i++){ \ | |
| 7 | + system("ovs-vsctl del-port "$1" "$i); \ | |
| 8 | + }}' | |
| 9 | + | |
| 10 | +BR=`br-br-list` | |
| 9 | 11 | |
| 10 | 12 | if [ x"$BR" != x"" ]; then |
| 11 | 13 | for i in $BR |
| 12 | 14 | do |
| 13 | - ovs-vsctl del-br $i | |
| 15 | + ip link set $i down | |
| 16 | + ovs-vsctl del-br $i >& /dev/null | |
| 14 | 17 | done |
| 15 | 18 | fi |
| 16 | 19 | |
| 17 | - | |
| 18 | - | |
| 20 | +exit 0 |
| @@ -1,6 +1,6 @@ | ||
| 1 | 1 | [Unit] |
| 2 | 2 | Description=Fulcon/Slot-OS Platform |
| 3 | -After=network.target NetworkManager.service docker.service | |
| 3 | +After=network.target NetworkManager.service docker.service openvswitch-switch.service openvswitch-nonetwork.service | |
| 4 | 4 | |
| 5 | 5 | [Service] |
| 6 | 6 | ExecStart=/usr/lib/fulcon/sbin/fulcond |
Fulcon-VirtualPlatform
Fork