Thanks I merged this series, I'll submit a separate patch for the typo.
On Tue, Apr 12, 2011 at 1:17 PM, Justin Pettit <[email protected]> wrote: > Looks good to me. It's not related to your patch, but I see a typo in some > of the surrounding context: "an state" -> "a state". > > Thanks! > > --Justin > > > On Apr 12, 2011, at 1:13 PM, Ethan Jackson wrote: > >> --- >> Reposted here for completeness. I'll go ahead and merge if this looks fine. >> --- >> xenserver/openvswitch-xen.spec | 13 +++++++++++-- >> 1 files changed, 11 insertions(+), 2 deletions(-) >> >> diff --git a/xenserver/openvswitch-xen.spec b/xenserver/openvswitch-xen.spec >> index 7a2e176..4d03991 100644 >> --- a/xenserver/openvswitch-xen.spec >> +++ b/xenserver/openvswitch-xen.spec >> @@ -233,8 +233,17 @@ if [ "$1" = "1" ]; then # $1 = 2 for upgrade >> printf "or any hosted VM will fail until after the reboot and could\n" >> printf "leave the server in an state requiring manual recovery.\n\n" >> else >> - printf "\nTo use the new Open vSwitch install, you should reboot the\n" >> - printf "server now. Failure to do so may result in incorrect >> operation." >> + >> + mode=$(cat /etc/xensource/network.conf) >> + if [ "$mode" != "vswitch" ] && [ "$mode" != "openvswitch" ]; then >> + printf "\nThe server is not configured to run Open vSwitch. To run >> in\n" >> + printf "vswitch mode, you must run the following command:\n\n" >> + printf "\txe-switch-network-backend vswitch" >> + else >> + printf "\nTo use the new Open vSwitch install, you should reboot >> the\n" >> + printf "server now. Failure to do so may result in incorrect >> operation." >> + fi >> + >> printf "\n\n" >> fi >> >> -- >> 1.7.4.2 >> >> _______________________________________________ >> dev mailing list >> [email protected] >> http://openvswitch.org/mailman/listinfo/dev > > _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
