[ovs-git] Open vSwitch: xenserver: Revert only the XenServer scripts no longer replaced by OVS. (master)

dev at openvswitch.org dev at openvswitch.org
Fri Feb 18 22:49:29 UTC 2011

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Open vSwitch".

The branch, master has been updated
       via  5cb12f2eeffdfcb7696bdcb652b581cfd13d1c3a (commit)
      from  878ae780124c64547591e3e67371d7e5eea8fd5a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5cb12f2eeffdfcb7696bdcb652b581cfd13d1c3a
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=5cb12f2eeffdfcb7696bdcb652b581cfd13d1c3a
Author: Andrew Evans <aevans at nicira.com>
xenserver: Revert only the XenServer scripts no longer replaced by OVS.
Commit d66880ee (xenserver: Clean up /usr/sbin/brctl dangling symlink.)
attempted to revert the original XenServer-shipped versions of scripts replaced
by OVS during an RPM upgrade, but the logic was incorrect. It assumed that
%postun of the package being replaced was run before the %post of the new
version replacing it. The reverse is actually true.

Make upgrade and erase cases both work correctly by simply checking whether any
of the files ever replaced in any OVS version are dangling symlinks, and if so,
attempt to copy the saved XenServer original back to its rightful place. In the
upgrade case, if the newly-installed version of OVS lacks any of the scripts in
the previous version, those will be reverted. In the erase case, none of the
OVS replacements will exist, so they will all be dangling symlinks and will all
be reverted.

Furthermore, replace any dangling symlink from /usr/sbin/xen-bugtool to the
now-nonexistent OVS replacement (caused by commit 92dbd5c9 (xenserver: Replace
customized xen-bugtool with plugin to collect qdisc info.)).

Lastly, prevent accidental reversion of files replaced by OVS during rpm -U
(also caused by commit 92dbd5c9).

Bug #4696.


Summary of changes:
 xenserver/openvswitch-xen.spec |   87 ++++++++++++++++++++++++++-------------
 1 files changed, 58 insertions(+), 29 deletions(-)

Open vSwitch

More information about the git mailing list