Skip to content

Commit a320b34

Browse files
committed
xenserver: Avoid "rpm -i" warnings on XenServer 5.5.900.
Open vSwitch installs successfully on XenServer 5.5.900 but it prints some worrying messages during the process. This commit fixes them.
1 parent 8398cf7 commit a320b34

2 files changed

Lines changed: 21 additions & 22 deletions

File tree

INSTALL.XenServer

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@
22
===============================================
33

44
This document describes how to build and install Open vSwitch on a
5-
Citrix XenServer 5.5.0 host. If you want to install Open vSwitch on a
5+
Citrix XenServer host. If you want to install Open vSwitch on a
66
generic Linux host, see INSTALL.Linux instead.
77

8+
These instructions have been tested with XenServer versions 5.5.0 and
9+
5.5.900.
10+
811
Building Open vSwitch for XenServer
912
-----------------------------------
1013

xenserver/vswitch-xen.spec

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -109,34 +109,30 @@ if [ ! -f /etc/xensource-inventory ]; then
109109
fi
110110

111111
if [ "$1" = "1" ]; then
112-
if ! md5sum -c --status <<EOF
112+
if md5sum -c --status <<EOF
113+
ca141d60061dcfdade73e75abc6529b5 /usr/sbin/brctl
113114
b8e9835862ef1a9cec2a3f477d26c989 /etc/xensource/scripts/vif
114115
51970ad613a3996d5997e18e44db47da /opt/xensource/libexec/interface-reconfigure
115116
5654c8c36699fcc8744ca9cd5b855414 /usr/sbin/xen-bugtool
116117
EOF
117118
then
118-
printf "\nThe original XenServer scripts replaced by this package\n"
119-
printf "are different than expected. This could lead to unexpected\n"
120-
printf "behavior of your server. Unless you are sure you know what\n"
121-
printf "you are doing, it is highly recommended that you remove this\n"
122-
printf "package immediately after the install completes, which\n"
123-
printf "will restore the XenServer scripts that you were previously\n"
124-
printf "using.\n\n"
125-
fi
126-
if test "`/usr/sbin/brctl --version`" != "bridge-utils, 1.1"; then
119+
printf "\nVerified host scripts from XenServer 5.5.0.\n\n"
120+
elif md5sum -c --status <<EOF
121+
ca141d60061dcfdade73e75abc6529b5 /usr/sbin/brctl
122+
b8e9835862ef1a9cec2a3f477d26c989 /etc/xensource/scripts/vif
123+
ce451d3c985fd1db6497a363f0d9dedb /opt/xensource/libexec/interface-reconfigure
124+
2b53f500431fcba5276c896e9e4281b9 /usr/sbin/xen-bugtool
125+
EOF
126+
printf "\nVerified host scripts from XenServer 5.5.900.\n\n"
127+
else
127128
cat <<EOF
128129

129-
/usr/sbin/brctl replaced by this package reports the following version:
130-
131-
`/usr/sbin/brctl --version`
132-
133-
The expected version was:
134-
135-
bridge-utils, 1.1
136-
137-
Unless you are sure you know what you are doing, it is highly recommended that
138-
you remove this package immediately after the install completes, which will
139-
restore the original /usr/sbin/brctl.
130+
The original XenServer scripts replaced by this package are not those
131+
of any supported version of XenServer. This could lead to unexpected
132+
behavior of your server. Unless you are sure you know what you are
133+
doing, it is highly recommended that you remove this package
134+
immediately after the install completes, which will restore the
135+
XenServer scripts that you were previously using.
140136

141137
EOF
142138
fi

0 commit comments

Comments
 (0)