From e3582fcae3ac30c3ff1d8c5e3d27975aec07d41f Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Fri, 15 May 2009 17:19:35 -0700 Subject: [PATCH] Rename brcompatd to ovs-brcompatd, for consistency. --- INSTALL | 2 +- datapath/brcompat.c | 2 +- vswitchd/.gitignore | 4 ++-- vswitchd/automake.mk | 14 +++++++------- vswitchd/{brcompatd.8.in => ovs-brcompatd.8.in} | 12 ++++++------ vswitchd/{brcompatd.c => ovs-brcompatd.c} | 0 vswitchd/vswitchd.conf.5.in | 7 ++++--- xenserver/etc_init.d_vswitch | 16 ++++++++-------- xenserver/etc_init.d_vswitch-xapi-update | 4 ++-- xenserver/etc_sysconfig_vswitch.example | 10 +++++----- ...ib_xsconsole_plugins-base_XSFeatureVSwitch.py | 6 +++--- xenserver/vswitch-xen.spec | 4 ++-- 12 files changed, 41 insertions(+), 40 deletions(-) rename vswitchd/{brcompatd.8.in => ovs-brcompatd.8.in} (80%) rename vswitchd/{brcompatd.c => ovs-brcompatd.c} (100%) diff --git a/INSTALL b/INSTALL index e6dde2e7..68efbdb0 100644 --- a/INSTALL +++ b/INSTALL @@ -148,7 +148,7 @@ distribution in the ordinary way using "configure" and "make". - Virtual switch daemon: vswitchd/vswitchd - - Bridge compatibility daemon: vswitchd/brcompatd + - Bridge compatibility daemon: vswitchd/ovs-brcompatd - Datapath administration utility: utilities/ovs-dpctl. diff --git a/datapath/brcompat.c b/datapath/brcompat.c index 4175ad1c..4cbce781 100644 --- a/datapath/brcompat.c +++ b/datapath/brcompat.c @@ -22,7 +22,7 @@ static struct genl_multicast_group brc_mc_group; /* Time to wait for vswitchd to respond to a datapath action, in jiffies. */ #define BRC_TIMEOUT (HZ * 5) -/* Mutex to serialize brcompatd callbacks. (Some callbacks naturally hold +/* Mutex to serialize ovs-brcompatd callbacks. (Some callbacks naturally hold * br_ioctl_mutex, others hold rtnl_lock, but we can't take the former * ourselves and we don't want to hold the latter over a potentially long * period of time.) */ diff --git a/vswitchd/.gitignore b/vswitchd/.gitignore index 3c5880b3..27233bcc 100644 --- a/vswitchd/.gitignore +++ b/vswitchd/.gitignore @@ -1,7 +1,7 @@ /Makefile /Makefile.in -/brcompatd -/brcompatd.8 +/ovs-brcompatd +/ovs-brcompatd.8 /vswitchd /vswitchd.8 /vswitchd.conf.5 diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk index e16d9578..71516b4a 100644 --- a/vswitchd/automake.mk +++ b/vswitchd/automake.mk @@ -1,10 +1,10 @@ -sbin_PROGRAMS += vswitchd/vswitchd vswitchd/brcompatd +sbin_PROGRAMS += vswitchd/vswitchd vswitchd/ovs-brcompatd man_MANS += vswitchd/vswitchd.conf.5 \ vswitchd/vswitchd.8 \ - vswitchd/brcompatd.8 + vswitchd/ovs-brcompatd.8 DISTCLEANFILES += vswitchd/vswitchd.conf.5 \ vswitchd/vswitchd.8 \ - vswitchd/brcompatd.8 + vswitchd/ovs-brcompatd.8 vswitchd_vswitchd_SOURCES = \ vswitchd/bridge.c \ @@ -25,13 +25,13 @@ vswitchd_vswitchd_LDADD = \ $(FAULT_LIBS) \ $(SSL_LIBS) -vswitchd_brcompatd_SOURCES = \ - vswitchd/brcompatd.c +vswitchd_ovs_brcompatd_SOURCES = \ + vswitchd/ovs-brcompatd.c -vswitchd_brcompatd_LDADD = \ +vswitchd_ovs_brcompatd_LDADD = \ lib/libopenvswitch.a \ $(FAULT_LIBS) EXTRA_DIST += vswitchd/vswitchd.conf.5.in \ vswitchd/vswitchd.8.in \ - vswitchd/brcompatd.8.in + vswitchd/ovs-brcompatd.8.in diff --git a/vswitchd/brcompatd.8.in b/vswitchd/ovs-brcompatd.8.in similarity index 80% rename from vswitchd/brcompatd.8.in rename to vswitchd/ovs-brcompatd.8.in index 8f47525f..15c30518 100644 --- a/vswitchd/brcompatd.8.in +++ b/vswitchd/ovs-brcompatd.8.in @@ -1,11 +1,11 @@ -.TH brcompatd 8 "March 2009" "Open vSwitch" "Open vSwitch Manual" -.ds PN brcompatd +.TH ovs\-brcompatd 8 "March 2009" "Open vSwitch" "Open vSwitch Manual" +.ds PN ovs\-brcompatd . .SH NAME -brcompatd \- Bridge compatibility front-end for vswitchd +ovs\-brcompatd \- Bridge compatibility front-end for vswitchd . .SH SYNOPSIS -.B brcompatd +.B ovs\-brcompatd [\fIoptions\fR] \fIconfig\fR . .SH DESCRIPTION @@ -17,7 +17,7 @@ that attach to them. It modifies \fIconfig\fR and forces .PP .SH OPTIONS .IP "\fB--reload-command=\fIcommand\fR" -Sets the command that \fBbrcompatd\fR runs to force \fBvswitchd\fR to +Sets the command that \fBovs\-brcompatd\fR runs to force \fBvswitchd\fR to reload its configuration file to \fIcommand\fR. The command is run in a subshell, so it may contain arbitrary shell metacharacters, etc. The \fB--help\fR option displays the default reload command. @@ -40,7 +40,7 @@ Sets the maximum time to wait for \fIconfig\fR to become unlocked to .so lib/leak-checker.man . .SH NOTES -\fBbrcompatd\fR requires the \fBbrcompat_mod.ko\fR kernel module to be +\fBovs\-brcompatd\fR requires the \fBbrcompat_mod.ko\fR kernel module to be loaded. .SH "SEE ALSO" .BR ovs-appctl (8), diff --git a/vswitchd/brcompatd.c b/vswitchd/ovs-brcompatd.c similarity index 100% rename from vswitchd/brcompatd.c rename to vswitchd/ovs-brcompatd.c diff --git a/vswitchd/vswitchd.conf.5.in b/vswitchd/vswitchd.conf.5.in index 25b2eeeb..5f1171c1 100644 --- a/vswitchd/vswitchd.conf.5.in +++ b/vswitchd/vswitchd.conf.5.in @@ -41,7 +41,8 @@ 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 \fBovs-cfg-mod\fR, may alter the order of elements and +\fBovs\-brcompatd\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 @@ -637,5 +638,5 @@ To entirely disable controller connection snooping, set \fBnone\fR. .SH "SEE ALSO" .BR vswitchd (8), -.BR brcompatd (8), -.BR ovs-cfg-mod (8). +.BR ovs\-brcompatd (8), +.BR ovs\-cfg\-mod (8). diff --git a/xenserver/etc_init.d_vswitch b/xenserver/etc_init.d_vswitch index bf52c921..61b41526 100755 --- a/xenserver/etc_init.d_vswitch +++ b/xenserver/etc_init.d_vswitch @@ -44,8 +44,8 @@ VSWITCHD_STRACE_OPT="${VSWITCHD_STRACE_OPT:-}" VSWITCHD_VALGRIND_LOG="${VSWITCHD_VALGRIND_LOG:-}" VSWITCHD_VALGRIND_OPT="${VSWITCHD_VALGRIND_OPT:-}" -# Config variables specific brcompatd -BRCOMPATD_PIDFILE="${BRCOMPATD_PIDFILE:-/var/run/brcompatd.pid}" +# Config variables specific to ovs-brcompatd +BRCOMPATD_PIDFILE="${BRCOMPATD_PIDFILE:-/var/run/ovs-brcompatd.pid}" BRCOMPATD_PRIORITY="${BRCOMPATD_PRIORITY:--5}" BRCOMPATD_LOGFILE="${BRCOMPATD_LOGFILE:-/var/log/brcompatd.log}" BRCOMPATD_FILE_LOGLEVEL="${BRCOMPATD_FILE_LOGLEVEL:-}" @@ -61,7 +61,7 @@ BRCOMPATD_VALGRIND_OPT="${BRCOMPATD_VALGRIND_OPT:-}" # Full paths to executables & modules vswitchd="$VSWITCH_BASE/sbin/vswitchd" -brcompatd="$VSWITCH_BASE/sbin/brcompatd" +brcompatd="$VSWITCH_BASE/sbin/ovs-brcompatd" dpctl="$VSWITCH_BASE/bin/ovs-dpctl" appctl="$VSWITCH_BASE/bin/ovs-appctl" ofctl="$VSWITCH_BASE/bin/ovs-ofctl" @@ -245,10 +245,10 @@ function start_brcompatd { reload_cmd='/root/vswitch/bin/ovs-appctl -t /var/run/vswitchd.`cat /var/run/vswitchd.pid`.ctl -e vswitchd/reload 2>&1 | /usr/bin/logger -t brcompatd-reload' if [ "$daemonize" != "y" ]; then # Start in background and force a "success" message - action "Starting brcompatd ($strace_opt$valgrind_opt)" true + action "Starting ovs-brcompatd ($strace_opt$valgrind_opt)" true (nice -n "$VSWITCHD_PRIORITY" $strace_opt $valgrind_opt "$brcompatd" --reload-command="$reload_cmd" -P$BRCOMPATD_PIDFILE -vANY:CONSOLE:EMER $syslog_opt $logfile_level_opt $logfile_file_opt $leak_opt "$VSWITCHD_CONF") & else - action "Starting brcompatd" nice -n "$BRCOMPATD_PRIORITY" $strace_opt $valgrind_opt "$brcompatd" --reload-command="$reload_cmd" -P$BRCOMPATD_PIDFILE -D -vANY:CONSOLE:EMER $syslog_opt $logfile_level_opt $logfile_file_opt $leak_opt "$VSWITCHD_CONF" + action "Starting ovs-brcompatd" nice -n "$BRCOMPATD_PRIORITY" $strace_opt $valgrind_opt "$brcompatd" --reload-command="$reload_cmd" -P$BRCOMPATD_PIDFILE -D -vANY:CONSOLE:EMER $syslog_opt $logfile_level_opt $logfile_file_opt $leak_opt "$VSWITCHD_CONF" fi } @@ -263,7 +263,7 @@ function stop_vswitchd { function stop_brcompatd { if [ -f "$BRCOMPATD_PIDFILE" ]; then local pid=$(cat "$BRCOMPATD_PIDFILE") - action "Killing brcompatd ($pid)" kill -TERM $pid + action "Killing ovs-brcompatd ($pid)" kill -TERM $pid rm -f "$BRCOMPATD_PIDFILE" fi } @@ -362,11 +362,11 @@ case "$1" in ;; status) status -p vswitchd.pid vswitchd - status -p brcompatd.pid brcompatd + status -p brcompatd.pid ovs-brcompatd ;; version) "$VSWITCH_BASE"/sbin/vswitchd -V - "$VSWITCH_BASE"/sbin/brcompatd -V + "$VSWITCH_BASE"/sbin/ovs-brcompatd -V ;; help) printf "vswitch [start|stop|restart|reload|unload|status|version]\n" diff --git a/xenserver/etc_init.d_vswitch-xapi-update b/xenserver/etc_init.d_vswitch-xapi-update index cd6e7d1f..25003d38 100755 --- a/xenserver/etc_init.d_vswitch-xapi-update +++ b/xenserver/etc_init.d_vswitch-xapi-update @@ -31,9 +31,9 @@ VSWITCHD_LOGFILE="${VSWITCHD_LOGFILE:-/var/log/vswitchd.log}" VSWITCHD_FILE_LOGLEVEL="${VSWITCHD_FILE_LOGLEVEL:-}" VSWITCHD_SYSLOG_LOGLEVEL="${VSWITCHD_SYSLOG_LOGLEVEL:-WARN}" VSWITCHD_MEMLEAK_LOGFILE="${VSWITCHD_MEMLEAK_LOGFILE:-}" -BRCOMPATD_PIDFILE="${BRCOMPATD_PIDFILE:-/var/run/brcompatd.pid}" +BRCOMPATD_PIDFILE="${BRCOMPATD_PIDFILE:-/var/run/ovs-brcompatd.pid}" BRCOMPATD_PRIORITY="${BRCOMPATD_PRIORITY:--5}" -BRCOMPATD_LOGFILE="${BRCOMPATD_LOGFILE:-/var/log/brcompatd.log}" +BRCOMPATD_LOGFILE="${BRCOMPATD_LOGFILE:-/var/log/ovs-brcompatd.log}" BRCOMPATD_FILE_LOGLEVEL="${BRCOMPATD_FILE_LOGLEVEL:-}" BRCOMPATD_SYSLOG_LOGLEVEL="${BRCOMPATD_SYSLOG_LOGLEVEL:-WARN}" BRCOMPATD_MEMLEAK_LOGFILE="${BRCOMPATD_MEMLEAK_LOGFILE:-}" diff --git a/xenserver/etc_sysconfig_vswitch.example b/xenserver/etc_sysconfig_vswitch.example index bdebf84f..8de056eb 100644 --- a/xenserver/etc_sysconfig_vswitch.example +++ b/xenserver/etc_sysconfig_vswitch.example @@ -11,7 +11,7 @@ # VSWITCH_BASE=/root/vswitch/openvswitch/build # ENABLE_BRCOMPAT: If 'y' than emulate linux bridging interfaces -# using the brcompat kernel module and brcompatd daemon +# using the brcompat kernel module and ovs-brcompatd daemon # ENABLE_BRCOMPAT=y # ENABLE_FAKE_PROC_NET: If 'y' then emulate linux bonding and vlan @@ -54,18 +54,18 @@ # VSWITCHD_SYSLOG_LOGLEVEL="WARN" # BRCOMPATD_PIDFILE: File in which to store the pid of the running -# brcompatd (the Linux bridge compatibility daemon for vswitchd). -# If this is the empty string, brcompatd will not be started and +# ovs-brcompatd (the Linux bridge compatibility daemon for vswitchd). +# If this is the empty string, ovs-brcompatd will not be started and # the brcompat_mod kernel module will not be inserted. Note that # the default is to use brcompat! -# BRCOMPATD_PIDFILE=/var/run/brcompatd.pid +# BRCOMPATD_PIDFILE=/var/run/ovs-brcompatd.pid # BRCOMPATD_PRIORITY: "nice" priority at which to run vswitchd and related # processes. # BRCOMPATD_PRIORITY=-5 # BRCOMPATD_LOGFILE: File to send the FILE_LOGLEVEL log messages to. -# BRCOMPATD_LOGFILE=/var/log/brcompatd.log +# BRCOMPATD_LOGFILE=/var/log/ovs-brcompatd.log # BRCOMPATD_FILE_LOGLEVEL: Log level at which to log into the # BRCOMPATD_LOG file. If this is null or not set the logfile will diff --git a/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py b/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py index 1a88b2b6..78a6654e 100644 --- a/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py +++ b/xenserver/usr_lib_xsconsole_plugins-base_XSFeatureVSwitch.py @@ -101,7 +101,7 @@ class VSwitchControllerDialogue(Dialogue): lambda: self.syncController()), # ChoiceDef(Lang("Restart vswitchd"), # lambda: self.restartService("vswitch")), -# ChoiceDef(Lang("Restart brcompatd"), +# ChoiceDef(Lang("Restart ovs-brcompatd"), # lambda: self.restartService("vswitch-brcompatd")) ] self.menu = Menu(self, None, Lang("Configure vSwitch"), choiceDefs) @@ -267,8 +267,8 @@ class XSFeatureVSwitch: inPane.NewLine() inPane.AddStatusField(Lang("vswitchd status", 20), VSwitchService.Inst("vswitch", "vswitchd").status()) - inPane.AddStatusField(Lang("brcompatd status", 20), - VSwitchService.Inst("vswitch", "brcompatd").status()) + inPane.AddStatusField(Lang("ovs-brcompatd status", 20), + VSwitchService.Inst("vswitch", "ovs-brcompatd").status()) inPane.AddKeyHelpField( { Lang("") : Lang("Reconfigure"), diff --git a/xenserver/vswitch-xen.spec b/xenserver/vswitch-xen.spec index df69356a..01e84b4a 100644 --- a/xenserver/vswitch-xen.spec +++ b/xenserver/vswitch-xen.spec @@ -257,14 +257,14 @@ fi # include them. /root/vswitch/scripts/XSFeatureVSwitch.pyc /root/vswitch/scripts/XSFeatureVSwitch.pyo -/root/vswitch/sbin/brcompatd +/root/vswitch/sbin/ovs-brcompatd /root/vswitch/sbin/vswitchd /root/vswitch/bin/ovs-appctl /root/vswitch/bin/ovs-cfg-mod /root/vswitch/bin/ovs-dpctl /root/vswitch/bin/ovs-ofctl /root/vswitch/share/man/man5/vswitchd.conf.5 -/root/vswitch/share/man/man8/brcompatd.8 +/root/vswitch/share/man/man8/ovs-brcompatd.8 /root/vswitch/share/man/man8/ovs-appctl.8 /root/vswitch/share/man/man8/ovs-cfg-mod.8 /root/vswitch/share/man/man8/ovs-dpctl.8 -- 2.30.2