$RPM_BUILD_ROOT/usr/share/openvswitch/scripts/xen-bugtool
install -m 755 xenserver/usr_sbin_brctl \
$RPM_BUILD_ROOT/usr/share/openvswitch/scripts/brctl
-install -m 755 xenserver/ovs-xenserverd $RPM_BUILD_ROOT/usr/sbin/
install -m 755 xenserver/usr_share_openvswitch_scripts_sysconfig.template \
$RPM_BUILD_ROOT/usr/share/openvswitch/scripts/sysconfig.template
install -d -m 755 $RPM_BUILD_ROOT/usr/lib/xsconsole/plugins-base
fi
rm -f $XSS
ln -s $RNU $XSS
+
+ # If /etc/xensource/network.conf doesn't exist (it was added in 5.6.0),
+ # then interface-reconfigure will be unhappy when we run it below.
+ if test ! -e /etc/xensource/network.conf; then
+ echo bridge > /etc/xensource/network.conf
+ fi
fi
+
if test ! -e /var/xapi/network.dbcache; then
if test "$1" = 1; then
printf "Creating xapi database cache... "
rm -f /etc/openvswitch/vswitchd.cacert
rm -f /var/xapi/network.dbcache
- # Configure system to use bridge
- echo bridge > /etc/xensource/network.conf
+ if test "$PRODUCT_VERSION" != "5.5.0"; then
+ # Configure system to use bridge
+ echo bridge > /etc/xensource/network.conf
+ else
+ # Get rid of network.conf entirely, to make the system pristine.
+ rm -f /etc/xensource/network.conf
+ fi
printf "\nYou MUST reboot the server now to complete the change to\n"
printf "standard Xen networking. Attempts to modify networking on the\n"
/usr/share/openvswitch/vswitch.ovsschema
/usr/sbin/ovs-brcompatd
/usr/sbin/ovs-vswitchd
-/usr/sbin/ovs-xenserverd
/usr/sbin/ovsdb-server
/usr/bin/ovs-appctl
/usr/bin/ovs-dpctl
/usr/share/man/man8/ovs-ofctl.8.gz
/usr/share/man/man8/ovs-vsctl.8.gz
/usr/share/man/man8/ovs-vswitchd.8.gz
-/usr/share/man/man8/ovs-xenserverd.8.gz
/var/lib/openvswitch
%exclude /usr/lib/xsconsole/plugins-base/*.pyc
%exclude /usr/lib/xsconsole/plugins-base/*.pyo