[PATCH] Cleanup default file locations and XenServer packaging

From bc39196036f8e33d15274855087f0c47be2095ee Mon Sep 17 00:00:00 2001
Date: Thu, 25 Mar 2010 22:38:13 -0700
This commit cleans up the locations of a number of files and directories
used.  These include:

    - Config file lives in /etc/openvswitch/conf.db
    - Logs go into /var/log/openvswitch
    - ovsdb-server socket is /var/run/openvswitch/db.sock
    - Schema goes into /usr/share/openvswitch/vswitch.ovsschema
    - PID files go in /var/run/openvswitch

For XenServer, these additional changes are made:

    - Cores go in /var/xen/openvswitch
    - OVS binaries run in /var/xen/openvswitch

In addition, it attempts to cleanup the XenServer packaging.  This
includes referring to the project as "openvswitch" as opposed to the
somewhat presumptuous "vswitch".

Note: Changes to the Debian packaging will be forthcoming.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 INSTALL.Linux                                      |    4 +-
 INSTALL.SSL                                        |    4 +-
 INSTALL.XenServer                                  |   14 +-
 INSTALL.bridge                                     |    2 +-
 debian/openvswitch-switch.init                     |    2 +-
 lib/dirs.h                                         |    4 +-
 lib/unixctl.c                                      |    2 +-
 m4/openvswitch.m4                                  |    5 +-
 utilities/ovs-vsctl.8.in                           |    2 +-
 utilities/ovs-vsctl.c                              |    2 +-
 xenserver/README                                   |   63 ++--
 xenserver/automake.mk                              |   16 +-
 xenserver/etc_init.d_openvswitch                   |  440 ++++++++++++++++++++
 xenserver/etc_init.d_openvswitch-xapi-update       |   54 +++
 xenserver/etc_init.d_vswitch                       |  425 -------------------
 xenserver/etc_init.d_vswitch-xapi-update           |   54 ---
 xenserver/etc_logrotate.d_openvswitch              |   16 +
 xenserver/etc_logrotate.d_vswitch                  |   16 -
 xenserver/etc_profile.d_openvswitch.sh             |   48 +++
 xenserver/etc_profile.d_vswitch.sh                 |   47 --
 .../etc_xapi.d_plugins_openvswitch-cfg-update      |  104 +++++
 xenserver/etc_xapi.d_plugins_vswitch-cfg-update    |  105 -----
 scripts/vif                |    2 +-
 xenserver/openvswitch-xen.spec                     |  370 ++++++++++++++++
 ..._lib_xsconsole_plugins-base_XSFeatureVSwitch.py |   20 +-
 xenserver/usr_sbin_brctl                           |    4 +-
 xenserver/usr_sbin_xen-bugtool                     |   45 +-
 ...share_openvswitch_scripts_refresh-network-uuids |   12 +
 ...sr_share_openvswitch_scripts_sysconfig.template |  234 +++++++++++
 ...usr_share_vswitch_scripts_refresh-network-uuids |   12 -
 .../usr_share_vswitch_scripts_sysconfig.template   |  234 -----------
 xenserver/vswitch-xen.spec                         |  374 -----------------
 32 files changed, 1376 insertions(+), 1360 deletions(-)
 create mode 100755 xenserver/etc_init.d_openvswitch
 create mode 100755 xenserver/etc_init.d_openvswitch-xapi-update
 delete mode 100755 xenserver/etc_init.d_vswitch
 delete mode 100755 xenserver/etc_init.d_vswitch-xapi-update
 create mode 100644 xenserver/etc_logrotate.d_openvswitch
 delete mode 100644 xenserver/etc_logrotate.d_vswitch
 create mode 100644 xenserver/etc_profile.d_openvswitch.sh
 delete mode 100644 xenserver/etc_profile.d_vswitch.sh
 create mode 100755 xenserver/etc_xapi.d_plugins_openvswitch-cfg-update
 delete mode 100755 xenserver/etc_xapi.d_plugins_vswitch-cfg-update
 create mode 100644 xenserver/openvswitch-xen.spec
 create mode 100755 xenserver/usr_share_openvswitch_scripts_refresh-network-uuids
 create mode 100644 xenserver/usr_share_openvswitch_scripts_sysconfig.template
 delete mode 100755 xenserver/usr_share_vswitch_scripts_refresh-network-uuids
 delete mode 100644 xenserver/usr_share_vswitch_scripts_sysconfig.template
 delete mode 100644 xenserver/vswitch-xen.spec

diff --git a/scripts/vif b/scripts/vif
index 56c710d814cfbd679b5ca23ddb171fa8384c6f6b..1a38dc4c990df06bdd1b9bc3ca5cb8cc239b32d0 100755 (executable)
--- a/scripts/vif
+++ b/scripts/vif
@@ -47,7 +47,7 @@ handle_promiscuous()
                esac
                ;;
            vswitch)
-               logger -t script-vif "${dev}: Promiscuous ports are not supported via vSwitch."
+               logger -t script-vif "${dev}: Promiscuous ports are not supported via Open vSwitch."
                ;;
        esac
     fi