From 431ed51b5dc84ddf24b2099052e9fad6293134d1 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Fri, 15 May 2009 11:16:52 -0700 Subject: [PATCH] Rename cfg-mod to ovs-cfg-mod, for consistency. --- utilities/.gitignore | 4 ++-- utilities/automake.mk | 14 +++++++------- utilities/{cfg-mod.8.in => ovs-cfg-mod.8.in} | 10 +++++----- utilities/{cfg-mod.c => ovs-cfg-mod.c} | 0 vswitchd/vswitchd.conf.5.in | 4 ++-- xenserver/etc_xapi.d_plugins_vswitch-cfg-update | 4 ++-- xenserver/etc_xensource_scripts_vif | 2 +- .../opt_xensource_libexec_interface-reconfigure | 2 +- ...sconsole_plugins-base_XSFeatureNiciraVSwitch.py | 2 +- xenserver/vswitch-xen.spec | 4 ++-- 10 files changed, 23 insertions(+), 23 deletions(-) rename utilities/{cfg-mod.8.in => ovs-cfg-mod.8.in} (91%) rename utilities/{cfg-mod.c => ovs-cfg-mod.c} (100%) diff --git a/utilities/.gitignore b/utilities/.gitignore index b54ac1c2..5f54285a 100644 --- a/utilities/.gitignore +++ b/utilities/.gitignore @@ -1,10 +1,10 @@ /Makefile /Makefile.in -/cfg-mod -/cfg-mod.8 /dpctl /dpctl.8 /nlmon +/ovs-cfg-mod +/ovs-cfg-mod.8 /ovs-controller /ovs-controller.8 /ovs-discover diff --git a/utilities/automake.mk b/utilities/automake.mk index 8f3fb605..c23a4f8a 100644 --- a/utilities/automake.mk +++ b/utilities/automake.mk @@ -1,7 +1,7 @@ bin_PROGRAMS += \ utilities/vlogconf \ - utilities/cfg-mod \ utilities/dpctl \ + utilities/ovs-cfg-mod \ utilities/ovs-controller \ utilities/ovs-discover \ utilities/ovs-kill \ @@ -12,8 +12,8 @@ noinst_SCRIPTS += utilities/ovs-pki-cgi utilities/ovs-parse-leaks dist_sbin_SCRIPTS += utilities/ovs-monitor EXTRA_DIST += \ - utilities/cfg-mod.8.in \ utilities/dpctl.8.in \ + utilities/ovs-cfg-mod.8.in \ utilities/ovs-controller.8.in \ utilities/ovs-discover.8.in \ utilities/ovs-kill.8.in \ @@ -23,8 +23,8 @@ EXTRA_DIST += \ utilities/ovs-pki.in \ utilities/vlogconf.8.in DISTCLEANFILES += \ - utilities/cfg-mod.8 \ utilities/dpctl.8 \ + utilities/ovs-cfg-mod.8 \ utilities/ovs-controller.8 \ utilities/ovs-discover.8 \ utilities/ovs-kill.8 \ @@ -35,23 +35,23 @@ DISTCLEANFILES += \ utilities/vlogconf.8 man_MANS += \ - utilities/cfg-mod.8 \ utilities/dpctl.8 \ + utilities/ovs-cfg-mod.8 \ utilities/ovs-controller.8 \ utilities/ovs-discover.8 \ utilities/ovs-kill.8 \ utilities/ovs-pki.8 \ utilities/vlogconf.8 -utilities_cfg_mod_SOURCES = utilities/cfg-mod.c -utilities_cfg_mod_LDADD = lib/libopenvswitch.a - utilities_dpctl_SOURCES = utilities/dpctl.c utilities_dpctl_LDADD = lib/libopenvswitch.a $(FAULT_LIBS) $(SSL_LIBS) utilities_vlogconf_SOURCES = utilities/vlogconf.c utilities_vlogconf_LDADD = lib/libopenvswitch.a +utilities_ovs_cfg_mod_SOURCES = utilities/ovs-cfg-mod.c +utilities_ovs_cfg_mod_LDADD = lib/libopenvswitch.a + utilities_ovs_controller_SOURCES = utilities/ovs-controller.c utilities_ovs_controller_LDADD = lib/libopenvswitch.a $(FAULT_LIBS) $(SSL_LIBS) diff --git a/utilities/cfg-mod.8.in b/utilities/ovs-cfg-mod.8.in similarity index 91% rename from utilities/cfg-mod.8.in rename to utilities/ovs-cfg-mod.8.in index b2f212fd..41d12d86 100644 --- a/utilities/cfg-mod.8.in +++ b/utilities/ovs-cfg-mod.8.in @@ -1,16 +1,16 @@ -.TH cfg-mod 8 "April 2009" "OpenVSwitch" "OpenVSwitch Manual" -.ds PN cfg-mod +.TH ovs-cfg-mod 8 "April 2009" "OpenVSwitch" "OpenVSwitch Manual" +.ds PN ovs-cfg-mod . .SH NAME -cfg-mod \- Safely manage a vswitchd.conf-style configuration file +ovs-cfg-mod \- Safely manage a vswitchd.conf-style configuration file . .SH SYNOPSIS -.B cfg-mod +.B ovs-cfg-mod --config-file=\fIfile\fR [ \fIaction\fR ][ \fIaction\fR \fI...\fR ] . .SH DESCRIPTION A program for managing a \fBvswitchd.conf\fR(5)-style configuration file. -\fBcfg-mod\fR uses the same locking mechanisms as \fBvswitchd\fR and its +\fBovs-cfg-mod\fR uses the same locking mechanisms as \fBvswitchd\fR and its related utilities. This allows it to be run safely on "live" configurations. diff --git a/utilities/cfg-mod.c b/utilities/ovs-cfg-mod.c similarity index 100% rename from utilities/cfg-mod.c rename to utilities/ovs-cfg-mod.c diff --git a/vswitchd/vswitchd.conf.5.in b/vswitchd/vswitchd.conf.5.in index 68dc2034..53bdcecc 100644 --- a/vswitchd/vswitchd.conf.5.in +++ b/vswitchd/vswitchd.conf.5.in @@ -41,7 +41,7 @@ within a configuration file is not significant. Blank lines, lines that consist only of white space, and lines that begin with \fB#\fR (optionally preceded by white space) are ignored. Keep in mind that programs that modify the configuration file, such as -\fBbrcompatd\fR and \fBcfg-mod\fR, may alter the order of elements and +\fBbrcompatd\fR and \fBovs-cfg-mod\fR, may alter the order of elements and strip comments and blank lines. .PP The following subsections describe how key-value pairs are used to @@ -638,4 +638,4 @@ To entirely disable controller connection snooping, set .SH "SEE ALSO" .BR vswitchd (8), .BR brcompatd (8), -.BR cfg-mod (8). +.BR ovs-cfg-mod (8). diff --git a/xenserver/etc_xapi.d_plugins_vswitch-cfg-update b/xenserver/etc_xapi.d_plugins_vswitch-cfg-update index 8d254587..a15dba01 100755 --- a/xenserver/etc_xapi.d_plugins_vswitch-cfg-update +++ b/xenserver/etc_xapi.d_plugins_vswitch-cfg-update @@ -30,7 +30,7 @@ import XenAPIPlugin import XenAPI import subprocess -cfg_mod="/root/vswitch/bin/cfg-mod" +cfg_mod="/root/vswitch/bin/ovs-cfg-mod" vswitchd_cfg_filename="/etc/vswitchd.conf" def update(session, args): @@ -106,7 +106,7 @@ def vswitchCfgMod(action_args): "--config-file=" + vswitchd_cfg_filename] + action_args exitcode = subprocess.call(cmd) if exitcode != 0: - log.error("cfg-mod failed with exit code " + log.error("ovs-cfg-mod failed with exit code " + str(exitcode) + " for " + repr(action_args)) raise XenAPIPlugin.Failure("VSWITCH_CONFIG_MOD_FAILURE", [ str(exitcode) , str(action_args) ]) diff --git a/xenserver/etc_xensource_scripts_vif b/xenserver/etc_xensource_scripts_vif index 43eafa7b..6051d9a2 100755 --- a/xenserver/etc_xensource_scripts_vif +++ b/xenserver/etc_xensource_scripts_vif @@ -13,7 +13,7 @@ # Keep other-config/ keys in sync with device.ml:vif_udev_keys -cfg_mod="/root/vswitch/bin/cfg-mod" +cfg_mod="/root/vswitch/bin/ovs-cfg-mod" service="/sbin/service" TYPE=`echo ${XENBUS_PATH} | cut -f 2 -d '/'` diff --git a/xenserver/opt_xensource_libexec_interface-reconfigure b/xenserver/opt_xensource_libexec_interface-reconfigure index 0f9acef4..427491ab 100755 --- a/xenserver/opt_xensource_libexec_interface-reconfigure +++ b/xenserver/opt_xensource_libexec_interface-reconfigure @@ -743,7 +743,7 @@ def configure_netdev(pif): print 'failed.' def modify_config(commands): - run_command(['/root/vswitch/bin/cfg-mod', '-vANY:console:emer', + run_command(['/root/vswitch/bin/ovs-cfg-mod', '-vANY:console:emer', '-F', '/etc/vswitchd.conf'] + commands + ['-c']) run_command(['/sbin/service', 'vswitch', 'reload']) diff --git a/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureNiciraVSwitch.py b/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureNiciraVSwitch.py index 26641066..24ff6e4c 100644 --- a/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureNiciraVSwitch.py +++ b/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureNiciraVSwitch.py @@ -14,7 +14,7 @@ logging.basicConfig(filename="/var/log/vswitch-xsplugin.log", level=logging.DEBU import os import subprocess -cfg_mod="/root/vswitch/bin/cfg-mod" +cfg_mod="/root/vswitch/bin/ovs-cfg-mod" vswitchd_cfg_filename="/etc/vswitchd.conf" if __name__ == "__main__": diff --git a/xenserver/vswitch-xen.spec b/xenserver/vswitch-xen.spec index 035e4617..1b1db623 100644 --- a/xenserver/vswitch-xen.spec +++ b/xenserver/vswitch-xen.spec @@ -252,12 +252,12 @@ fi /root/vswitch/scripts/XSFeatureNiciraVSwitch.pyo /root/vswitch/sbin/brcompatd /root/vswitch/sbin/vswitchd -/root/vswitch/bin/cfg-mod +/root/vswitch/bin/ovs-cfg-mod /root/vswitch/bin/dpctl /root/vswitch/bin/vlogconf /root/vswitch/share/man/man5/vswitchd.conf.5 /root/vswitch/share/man/man8/brcompatd.8 -/root/vswitch/share/man/man8/cfg-mod.8 +/root/vswitch/share/man/man8/ovs-cfg-mod.8 /root/vswitch/share/man/man8/dpctl.8 /root/vswitch/share/man/man8/vlogconf.8 /root/vswitch/share/man/man8/vswitchd.8 -- 2.30.2