[ovs-dev] [PATCH] xenserver: Clean up /usr/sbin/brctl dangling symlink.

[Ben Pfaff]

On Mon, Feb 14, 2011 at 01:09:46PM -0800, Andrew Evans wrote:
> Commit 54f16a10 removed Open vSwitch's /usr/sbin/brctl replacement for
> XenServer, but because the RPM doesn't restore the original files on upgrade,
> an upgrade leaves /usr/sbin/brctl a broken symlink to the removed
> /usr/share/openvswitch/scripts/brctl.
> 
> This commit adds a one-time cleanup to restore the original XenServer-supplied
> /usr/sbin/brctl. It also changes the RPM to restore all the replaced files with
> their XenServer originals at post-uninstall time during an upgrade transaction,
> just as uninstall has done up to now. This should prevent the same problem in
> the future.
> 
> Bug #4667.

A comment you added refers to a commit by number only.  It's better to
add the first line of the commit message, too, e.g.:
    # Bug #4667: one-time cleanup of brctl removal in commit 54f16a10
    # (xenserver: Remove brctl wrapper script).

In place of 
    if readlink /usr/sbin/brctl -q >/dev/null &&
I would write
    if test -h /usr/sbin/brctl &&

Otherwise this looks good to me.  I assume that you've tested the
installation, upgrade, and removal cases.  Thank you.