xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py \
$RPM_BUILD_ROOT/usr/lib/xsconsole/plugins-base/XSFeatureVSwitch.py
-install -d -m 755 $RPM_BUILD_ROOT/lib/modules/%{xen_version}/kernel/net/openvswitch
-find datapath/linux-2.6 -name *.ko -exec install -m 755 \{\} $RPM_BUILD_ROOT/lib/modules/%{xen_version}/kernel/net/openvswitch \;
+install -d -m 755 $RPM_BUILD_ROOT/lib/modules/%{xen_version}/kernel/extra/openvswitch
+find datapath/linux-2.6 -name *.ko -exec install -m 755 \{\} $RPM_BUILD_ROOT/lib/modules/%{xen_version}/kernel/extra/openvswitch \;
# Get rid of stuff we don't want to make RPM happy.
rm \
$RPM_BUILD_ROOT/usr/share/man/man8/ovs-kill.8 \
$RPM_BUILD_ROOT/usr/share/man/man8/ovs-openflowd.8 \
$RPM_BUILD_ROOT/usr/share/man/man8/ovs-pki.8
-rm -f $RPM_BUILD_ROOT/lib/modules/%{xen_version}/kernel/net/openvswitch/veth_mod.ko
install -d -m 755 $RPM_BUILD_ROOT/var/lib/openvswitch
printf "XenSource inventory not present in /etc/xensource-inventory"
exit 1
fi
+. /etc/xensource-inventory
if [ "$1" = "1" ]; then
if md5sum -c --status <<EOF
fi
fi
+# On XenServer 5.5.0, we need refresh-network-uuids to run whenever
+# XAPI starts or restarts. (On XenServer 5.6.0, XAPI calls the
+# "update" method of the vswitch-cfg-update plugin whenever it starts
+# or restarts, so this is no longer necessary.)
+if test "$PRODUCT_VERSION" = "5.5.0"; then
+ RNU=/usr/share/openvswitch/scripts/refresh-network-uuids
+ XSS=/opt/xensource/libexec/xapi-startup-script
+ if test -e $XSS && (test ! -L $XSS || test "`readlink $XSS`" != $RNU); then
+ echo "$XSS is already in use, refusing to overwrite"
+ exit 1
+ 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... "
# Create ovs-vswitchd config database
ovsdb-tool -vANY:console:emer create /etc/openvswitch/conf.db \
- /usr/share/openvswitch/vswitch.ovsschema \
+ /usr/share/openvswitch/vswitch.ovsschema
# Create initial table in config database
ovsdb-tool -vANY:console:emer transact /etc/openvswitch/conf.db \
%postun
if [ "$1" = "0" ]; then # $1 = 1 for upgrade
+ . /etc/xensource-inventory
+ if test "$PRODUCT_VERSION" = "5.5.0"; then
+ XSS=/opt/xensource/libexec/xapi-startup-script
+ rm -f $XSS
+ fi
rm -f /usr/lib/xsconsole/plugins-base/XSFeatureVSwitch.pyc \
/usr/lib/xsconsole/plugins-base/XSFeatureVSwitch.pyo
# Restore original XenServer scripts
for f in \
/opt/xensource/libexec/interface-reconfigure \
+ /opt/xensource/libexec/InterfaceReconfigure.py \
+ /opt/xensource/libexec/InterfaceReconfigureBridge.py \
+ /opt/xensource/libexec/InterfaceReconfigureVswitch.py \
/etc/xensource/scripts/vif \
/usr/sbin/xen-bugtool \
/usr/sbin/brctl
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"
/etc/xapi.d/plugins/openvswitch-cfg-update
/etc/logrotate.d/openvswitch
/etc/profile.d/openvswitch.sh
-/lib/modules/%{xen_version}/kernel/net/openvswitch/openvswitch_mod.ko
-/lib/modules/%{xen_version}/kernel/net/openvswitch/brcompat_mod.ko
-%if %(echo '%{xen_version}'|awk -F"." '{if ($3>=18) print 1; else print 0;}')
-/lib/modules/%{xen_version}/kernel/net/openvswitch/ip_gre_mod.ko
-%endif
+/lib/modules/%{xen_version}/kernel/extra/openvswitch/openvswitch_mod.ko
+/lib/modules/%{xen_version}/kernel/extra/openvswitch/brcompat_mod.ko
/usr/share/openvswitch/scripts/refresh-network-uuids
/usr/share/openvswitch/scripts/interface-reconfigure
/usr/share/openvswitch/scripts/InterfaceReconfigure.py