Skip to content

Commit d56d35d

Browse files
pmullaneyblp
authored andcommitted
xenserver: Add defaults for ENABLE_BRCOMPAT, ENABLE_FAKE_PROC_NET.
On non-XenServer systems there is no $PRODUCT_VERSION to test for default behavior, so use reasonable defaults in that case. Signed-off-by: Patrick Mullaney <pm.mullaney@gmail.com> Signed-off-by: Ben Pfaff <blp@nicira.com>
1 parent 77fd0ab commit d56d35d

1 file changed

Lines changed: 11 additions & 6 deletions

File tree

xenserver/etc_init.d_openvswitch

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,19 @@ case ${NETWORK_MODE:=openvswitch} in
7676
esac
7777

7878
# General config variables in /etc/sysconfig/openvswitch
79-
if test "$PRODUCT_VERSION" = "5.5.0"; then
80-
# XenServer 5.5.0 needs ovs-brcompatd and /proc/net simulation.
79+
if [ -f /etc/xensource-inventory ]; then
80+
if test "$PRODUCT_VERSION" = "5.5.0"; then
81+
# XenServer 5.5.0 needs ovs-brcompatd and /proc/net simulation.
82+
: ${ENABLE_BRCOMPAT:=y}
83+
: ${ENABLE_FAKE_PROC_NET:=y}
84+
else
85+
# Later versions don't need them.
86+
: ${ENABLE_BRCOMPAT:=n}
87+
: ${ENABLE_FAKE_PROC_NET:=n}
88+
fi
89+
else
8190
: ${ENABLE_BRCOMPAT:=y}
8291
: ${ENABLE_FAKE_PROC_NET:=y}
83-
else
84-
# Later versions don't need them.
85-
: ${ENABLE_BRCOMPAT:=n}
86-
: ${ENABLE_FAKE_PROC_NET:=n}
8792
fi
8893
: ${ENABLE_MONITOR:=y}
8994
: ${FORCE_COREFILES:=y}

0 commit comments

Comments
 (0)