xenserver: Don't require /etc/xensource/network.conf if not on XenServer.
authorPatrick Mullaney <pm.mullaney@gmail.com>
Wed, 15 Dec 2010 18:39:08 +0000 (10:39 -0800)
committerBen Pfaff <blp@nicira.com>
Fri, 7 Jan 2011 18:31:29 +0000 (10:31 -0800)
commit77fd0ab5835d47d36cfa8e23c5535a5343740697
tree02e41fc4c1c9cb14ff1472e6a4a9e59eb2e878e5
parent5badabf575544be30ac671c3961c65911c3f2490
xenserver: Don't require /etc/xensource/network.conf if not on XenServer.

On XenServer systems, the "network mode" (that is, whether the network
uses OpenvSwitch or the Linux bridge) is stored in
/etc/xensource/network.conf.  On other systems, we can't expect it to be
there.  This changes the init script to tolerate its absence, treating that
as meaning that Open vSwitch should be used (otherwise, why did the admin
install it?).

NETWORK_MODE can always be overridden in /etc/sysconfig/openvswitch anyway.

Signed-off-by: Patrick Mullaney <pm.mullaney@gmail.com>
[changed back to read /etc/xensource/network.conf if present]
Signed-off-by: Ben Pfaff <blp@nicira.com>
xenserver/etc_init.d_openvswitch