diff options
| author | Justin Pettit <jpettit@nicira.com> | 2010-08-09 15:07:32 -0700 |
|---|---|---|
| committer | Justin Pettit <jpettit@nicira.com> | 2010-08-25 16:48:21 -0700 |
| commit | c76fde78c528027fe95d714aba5ccf0f01407d75 (patch) | |
| tree | 66cd84edeb65d902923d460d3b12dc8b2664f354 /xenserver/openvswitch-xen.spec | |
| parent | bfe62d7a6099a43976aeb591b690964ef35e5cef (diff) | |
| download | openvswitch-c76fde78c528027fe95d714aba5ccf0f01407d75.tar.gz | |
xenserver: Prepend XenServer external ids with "xs-"
Signed-off-by: Justin Pettit <jpettit@nicira.com>
Diffstat (limited to 'xenserver/openvswitch-xen.spec')
| -rw-r--r-- | xenserver/openvswitch-xen.spec | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xenserver/openvswitch-xen.spec b/xenserver/openvswitch-xen.spec index f693ea0db..80dbec70c 100644 --- a/xenserver/openvswitch-xen.spec +++ b/xenserver/openvswitch-xen.spec @@ -73,8 +73,8 @@ install -m 644 xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py \ $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/InterfaceReconfigureVswitch.py install -m 755 xenserver/etc_xensource_scripts_vif \ $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/vif -install -m 755 xenserver/usr_share_openvswitch_scripts_refresh-network-uuids \ - $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/refresh-network-uuids +install -m 755 xenserver/usr_share_openvswitch_scripts_refresh-xs-network-uuids \ + $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/refresh-xs-network-uuids install -m 755 xenserver/usr_sbin_xen-bugtool \ $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/xen-bugtool install -m 755 xenserver/usr_sbin_brctl \ @@ -158,12 +158,12 @@ EOF fi fi -# On XenServer 5.5.0, we need refresh-network-uuids to run whenever +# On XenServer 5.5.0, we need refresh-xs-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 + RNU=/usr/share/openvswitch/scripts/refresh-xs-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" @@ -390,7 +390,7 @@ fi /usr/share/openvswitch/python/ovs/timeval.py /usr/share/openvswitch/python/ovs/util.py /usr/share/openvswitch/python/uuid.py -/usr/share/openvswitch/scripts/refresh-network-uuids +/usr/share/openvswitch/scripts/refresh-xs-network-uuids /usr/share/openvswitch/scripts/interface-reconfigure /usr/share/openvswitch/scripts/InterfaceReconfigure.py /usr/share/openvswitch/scripts/InterfaceReconfigureBridge.py |