From: Justin Pettit Date: Thu, 1 Apr 2010 12:12:17 +0000 (-0700) Subject: xenserver: Minor spec file cleanups X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e39950c21c5eb401be5924e798c570ffbd0c75b;p=openvswitch xenserver: Minor spec file cleanups Remove compiled InterfaceReconfigure byte code on uninstall. Also, fix minor typo in error message. --- diff --git a/xenserver/openvswitch-xen.spec b/xenserver/openvswitch-xen.spec index ac2f2a0f..7b5e0228 100644 --- a/xenserver/openvswitch-xen.spec +++ b/xenserver/openvswitch-xen.spec @@ -250,7 +250,7 @@ done plugin=$(readlink /usr/lib/xsconsole/plugins-base/XSFeatureVSwitch.py) if [ "$plugin" != "/usr/share/openvswitch/scripts/XSFeatureVSwitch.py" ]; then rm -f /usr/lib/xsconsole/plugins-base/XSFeatureVSwitch.py - ln -s /usr/share/openvswitch/scripts/XSFeatureVSwitch.py /usr/lib/xsconsole/plugins-base/ || printf "Could not link to vSswitch xsconsole plugin.\n" + ln -s /usr/share/openvswitch/scripts/XSFeatureVSwitch.py /usr/lib/xsconsole/plugins-base/ || printf "Could not link to Open vSwitch xsconsole plugin.\n" fi # Ensure all required services are set to run @@ -292,6 +292,13 @@ if [ "$1" = "0" ]; then # $1 = 1 for upgrade /usr/lib/xsconsole/plugins-base/XSFeatureVSwitch.pyo \ || printf "Could not remove Open vSwitch xsconsole plugin.\n" + rm -f /usr/share/openvswitch/scripts/InterfaceReconfigure.pyc \ + /usr/share/openvswitch/scripts/InterfaceReconfigure.pyo \ + /usr/share/openvswitch/scripts/InterfaceReconfigureBridge.pyc \ + /usr/share/openvswitch/scripts/InterfaceReconfigureBridge.pyo \ + /usr/share/openvswitch/scripts/InterfaceReconfigureVSwitch.pyc \ + /usr/share/openvswitch/scripts/InterfaceReconfigureVSwitch.pyo + # Restore original XenServer scripts for f in \ /opt/xensource/libexec/interface-reconfigure \