From: Chris Wright <chrisw@sous-sol.org>
Date: Fri, 9 Dec 2011 07:36:05 +0000 (-0800)
Subject: utilites: rename ovs-lib.sh to ovs-lib
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d422c1189901d34125cd2d46552391c333d1f647;p=openvswitch

utilites: rename ovs-lib.sh to ovs-lib

Rename this helper script to simply ovs-lib, since it's primarily
a library of helper functions.

Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/debian/openvswitch-switch.init b/debian/openvswitch-switch.init
index 3d187a05..6f08c3fa 100755
--- a/debian/openvswitch-switch.init
+++ b/debian/openvswitch-switch.init
@@ -25,7 +25,7 @@
 
 (test -x /usr/sbin/ovs-vswitchd && test -x /usr/sbin/ovsdb-server) || exit 0
 
-. /usr/share/openvswitch/scripts/ovs-lib.sh
+. /usr/share/openvswitch/scripts/ovs-lib
 test -e /etc/default/openvswitch-switch && . /etc/default/openvswitch-switch
 
 if test X"$BRCOMPAT" = Xyes && test ! -x /usr/sbin/ovs-brcompatd; then
diff --git a/debian/openvswitch-switch.install b/debian/openvswitch-switch.install
index 308c382a..a7006ac0 100644
--- a/debian/openvswitch-switch.install
+++ b/debian/openvswitch-switch.install
@@ -7,6 +7,6 @@ usr/bin/ovsdb-tool
 usr/sbin/ovs-vswitchd
 usr/sbin/ovsdb-server
 usr/share/openvswitch/scripts/ovs-ctl
-usr/share/openvswitch/scripts/ovs-lib.sh
+usr/share/openvswitch/scripts/ovs-lib
 usr/share/openvswitch/scripts/ovs-save
 usr/share/openvswitch/vswitch.ovsschema
diff --git a/rhel/etc_init.d_openvswitch b/rhel/etc_init.d_openvswitch
index f1a34c7a..9f1506c3 100755
--- a/rhel/etc_init.d_openvswitch
+++ b/rhel/etc_init.d_openvswitch
@@ -27,7 +27,7 @@
 # Short-Description: Open vSwitch switch
 ### END INIT INFO
 
-. /usr/share/openvswitch/scripts/ovs-lib.sh || exit 1
+. /usr/share/openvswitch/scripts/ovs-lib || exit 1
 test -e /etc/sysconfig/openvswitch && . /etc/sysconfig/openvswitch
 
 start () {
diff --git a/rhel/openvswitch.spec.in b/rhel/openvswitch.spec.in
index 4d52d3b7..3d6cda3b 100644
--- a/rhel/openvswitch.spec.in
+++ b/rhel/openvswitch.spec.in
@@ -147,7 +147,7 @@ exit 0
 /usr/share/openvswitch/python/
 /usr/share/openvswitch/scripts/ovs-bugtool-*
 /usr/share/openvswitch/scripts/ovs-ctl
-/usr/share/openvswitch/scripts/ovs-lib.sh
+/usr/share/openvswitch/scripts/ovs-lib
 /usr/share/openvswitch/scripts/ovs-save
 /usr/share/openvswitch/scripts/sysconfig.template
 /usr/share/openvswitch/vswitch.ovsschema
diff --git a/utilities/.gitignore b/utilities/.gitignore
index ecc4d5f1..d9d4419a 100644
--- a/utilities/.gitignore
+++ b/utilities/.gitignore
@@ -12,7 +12,7 @@
 /ovs-ctl
 /ovs-dpctl
 /ovs-dpctl.8
-/ovs-lib.sh
+/ovs-lib
 /ovs-ofctl
 /ovs-ofctl.8
 /ovs-parse-leaks
diff --git a/utilities/automake.mk b/utilities/automake.mk
index 1c8a56b9..89078cb8 100644
--- a/utilities/automake.mk
+++ b/utilities/automake.mk
@@ -14,11 +14,11 @@ bin_SCRIPTS += \
 endif
 noinst_SCRIPTS += utilities/ovs-pki-cgi
 scripts_SCRIPTS += utilities/ovs-ctl utilities/ovs-save
-scripts_DATA += utilities/ovs-lib.sh
+scripts_DATA += utilities/ovs-lib
 
 EXTRA_DIST += \
 	utilities/ovs-ctl.in \
-	utilities/ovs-lib.sh.in \
+	utilities/ovs-lib.in \
 	utilities/ovs-parse-leaks.in \
 	utilities/ovs-pcap.in \
 	utilities/ovs-pki-cgi.in \
@@ -49,7 +49,7 @@ DISTCLEANFILES += \
 	utilities/ovs-benchmark.1 \
 	utilities/ovs-controller.8 \
 	utilities/ovs-dpctl.8 \
-	utilities/ovs-lib.sh \
+	utilities/ovs-lib \
 	utilities/ovs-ofctl.8 \
 	utilities/ovs-parse-leaks \
 	utilities/ovs-pcap \
diff --git a/utilities/ovs-ctl.in b/utilities/ovs-ctl.in
index 8788e4a3..ee6035c0 100755
--- a/utilities/ovs-ctl.in
+++ b/utilities/ovs-ctl.in
@@ -17,7 +17,7 @@ case $0 in
     */*) dir0=`echo "$0" | sed 's,/[^/]*$,,'` ;;
     *) dir0=./ ;;
 esac
-. "$dir0/ovs-lib.sh" || exit 1
+. "$dir0/ovs-lib" || exit 1
 
 for dir in "$sbindir" "$bindir" /sbin /bin /usr/sbin /usr/bin; do
     case :$PATH: in
diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in
new file mode 100644
index 00000000..f53d4afd
--- /dev/null
+++ b/utilities/ovs-lib.in
@@ -0,0 +1,172 @@
+# This is a shell function library sourced by some Open vSwitch scripts.
+# It is not intended to be invoked on its own.
+
+# Copyright (C) 2009, 2010, 2011 Nicira Networks, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+## ----------------- ##
+## configure options ##
+## ----------------- ##
+
+# All of these should be substituted by the Makefile at build time.
+logdir=${OVS_LOGDIR-'@LOGDIR@'}                 # /var/log/openvswitch
+rundir=${OVS_RUNDIR-'@RUNDIR@'}                 # /var/run/openvswitch
+sysconfdir=${OVS_SYSCONFDIR-'@sysconfdir@'}     # /etc
+etcdir=$sysconfdir/openvswitch                  # /etc/openvswitch
+datadir=${OVS_PKGDATADIR-'@pkgdatadir@'}        # /usr/share/openvswitch
+bindir=${OVS_BINDIR-'@bindir@'}                 # /usr/bin
+sbindir=${OVS_SBINDIR-'@sbindir@'}              # /usr/sbin
+
+VERSION='@VERSION@'
+case @BUILDNR@ in
+    [1-9]*) BUILDNR='+build@BUILDNR@' ;;
+    *) BUILDNR= ;;
+esac
+
+LC_ALL=C; export LC_ALL
+
+## ------------- ##
+## LSB functions ##
+## ------------- ##
+
+# Use the system's own implementations if it has any.
+if test -e /etc/init.d/functions; then
+    . /etc/init.d/functions
+elif test -e /etc/rc.d/init.d/functions; then
+    . /etc/rc.d/init.d/functions
+elif test -e /lib/lsb/init-functions; then
+    . /lib/lsb/init-functions
+fi
+
+# Implement missing functions (e.g. OpenSUSE lacks 'action').
+if type log_success_msg >/dev/null 2>&1; then :; else
+    log_success_msg () {
+        printf '%s.\n' "$*"
+    }
+fi
+if type log_failure_msg >/dev/null 2>&1; then :; else
+    log_failure_msg () {
+        printf '%s ... failed!\n' "$*"
+    }
+fi
+if type log_warning_msg >/dev/null 2>&1; then :; else
+    log_warning_msg () {
+        printf '%s ... (warning).\n' "$*"
+    }
+fi
+if type action >/dev/null 2>&1; then :; else
+    action () {
+       STRING=$1
+       shift
+       "$@"
+       rc=$?
+       if test $rc = 0; then
+            log_success_msg "$STRING"
+       else
+            log_failure_msg "$STRING"
+       fi
+       return $rc
+    }
+fi
+
+## ------- ##
+## Daemons ##
+## ------- ##
+
+pid_exists () {
+    # This is better than "kill -0" because it doesn't require permission to
+    # send a signal (so daemon_status in particular works as non-root).
+    test -d /proc/"$1"
+}
+
+start_daemon () {
+    priority=$1
+    shift
+    daemon=$1
+
+    # drop core files in a sensible place
+    test -d "$DAEMON_CWD" || install -d -m 755 -o root -g root "$DAEMON_CWD"
+    set "$@" --no-chdir
+    cd "$DAEMON_CWD"
+
+    # log file
+    test -d "$logdir" || install -d -m 755 -o root -g root "$logdir"
+    set "$@" --log-file="$logdir/$daemon.log"
+
+    # pidfile and monitoring
+    test -d "$rundir" || install -d -m 755 -o root -g root "$rundir"
+    set "$@" --pidfile="$rundir/$daemon.pid"
+    set "$@" --detach --monitor
+
+    # priority
+    if test X"$priority" != X; then
+        set nice -n "$priority" "$@"
+    fi
+
+    action "Starting $daemon" "$@"
+}
+
+DAEMON_CWD=/
+stop_daemon () {
+    if test -e "$rundir/$1.pid"; then
+        if pid=`cat "$rundir/$1.pid"`; then
+            for action in TERM .1 .25 .65 1 1 1 1 KILL 1 1 1 1 FAIL; do
+                case $action in
+                    TERM)
+                        action "Killing $1 ($pid)" kill $pid
+                        ;;
+                    KILL)
+                        action "Killing $1 ($pid) with SIGKILL" kill -9 $pid
+                        ;;
+                    FAIL)
+                        log_failure_msg "Killing $1 ($pid) failed"
+                        return 1
+                        ;;
+                    *)
+                        if pid_exists $pid >/dev/null 2>&1; then
+                            sleep $action
+                        else
+                            return 0
+                        fi
+                        ;;
+                esac
+            done
+        fi
+    fi
+    log_success_msg "$1 is not running"
+}
+
+daemon_status () {
+    pidfile=$rundir/$1.pid
+    if test -e "$pidfile"; then
+        if pid=`cat "$pidfile"`; then
+            if pid_exists "$pid"; then
+                echo "$1 is running with pid $pid"
+                return 0
+            else
+                echo "Pidfile for $1 ($pidfile) is stale"
+            fi
+        else
+            echo "Pidfile for $1 ($pidfile) exists but cannot be read"
+        fi
+    else
+        echo "$1 is not running"
+    fi
+    return 1
+}
+
+daemon_is_running () {
+    pidfile=$rundir/$1.pid
+    test -e "$pidfile" && pid=`cat "$pidfile"` && pid_exists "$pid"
+} >/dev/null 2>&1
diff --git a/utilities/ovs-lib.sh.in b/utilities/ovs-lib.sh.in
deleted file mode 100644
index f53d4afd..00000000
--- a/utilities/ovs-lib.sh.in
+++ /dev/null
@@ -1,172 +0,0 @@
-# This is a shell function library sourced by some Open vSwitch scripts.
-# It is not intended to be invoked on its own.
-
-# Copyright (C) 2009, 2010, 2011 Nicira Networks, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-## ----------------- ##
-## configure options ##
-## ----------------- ##
-
-# All of these should be substituted by the Makefile at build time.
-logdir=${OVS_LOGDIR-'@LOGDIR@'}                 # /var/log/openvswitch
-rundir=${OVS_RUNDIR-'@RUNDIR@'}                 # /var/run/openvswitch
-sysconfdir=${OVS_SYSCONFDIR-'@sysconfdir@'}     # /etc
-etcdir=$sysconfdir/openvswitch                  # /etc/openvswitch
-datadir=${OVS_PKGDATADIR-'@pkgdatadir@'}        # /usr/share/openvswitch
-bindir=${OVS_BINDIR-'@bindir@'}                 # /usr/bin
-sbindir=${OVS_SBINDIR-'@sbindir@'}              # /usr/sbin
-
-VERSION='@VERSION@'
-case @BUILDNR@ in
-    [1-9]*) BUILDNR='+build@BUILDNR@' ;;
-    *) BUILDNR= ;;
-esac
-
-LC_ALL=C; export LC_ALL
-
-## ------------- ##
-## LSB functions ##
-## ------------- ##
-
-# Use the system's own implementations if it has any.
-if test -e /etc/init.d/functions; then
-    . /etc/init.d/functions
-elif test -e /etc/rc.d/init.d/functions; then
-    . /etc/rc.d/init.d/functions
-elif test -e /lib/lsb/init-functions; then
-    . /lib/lsb/init-functions
-fi
-
-# Implement missing functions (e.g. OpenSUSE lacks 'action').
-if type log_success_msg >/dev/null 2>&1; then :; else
-    log_success_msg () {
-        printf '%s.\n' "$*"
-    }
-fi
-if type log_failure_msg >/dev/null 2>&1; then :; else
-    log_failure_msg () {
-        printf '%s ... failed!\n' "$*"
-    }
-fi
-if type log_warning_msg >/dev/null 2>&1; then :; else
-    log_warning_msg () {
-        printf '%s ... (warning).\n' "$*"
-    }
-fi
-if type action >/dev/null 2>&1; then :; else
-    action () {
-       STRING=$1
-       shift
-       "$@"
-       rc=$?
-       if test $rc = 0; then
-            log_success_msg "$STRING"
-       else
-            log_failure_msg "$STRING"
-       fi
-       return $rc
-    }
-fi
-
-## ------- ##
-## Daemons ##
-## ------- ##
-
-pid_exists () {
-    # This is better than "kill -0" because it doesn't require permission to
-    # send a signal (so daemon_status in particular works as non-root).
-    test -d /proc/"$1"
-}
-
-start_daemon () {
-    priority=$1
-    shift
-    daemon=$1
-
-    # drop core files in a sensible place
-    test -d "$DAEMON_CWD" || install -d -m 755 -o root -g root "$DAEMON_CWD"
-    set "$@" --no-chdir
-    cd "$DAEMON_CWD"
-
-    # log file
-    test -d "$logdir" || install -d -m 755 -o root -g root "$logdir"
-    set "$@" --log-file="$logdir/$daemon.log"
-
-    # pidfile and monitoring
-    test -d "$rundir" || install -d -m 755 -o root -g root "$rundir"
-    set "$@" --pidfile="$rundir/$daemon.pid"
-    set "$@" --detach --monitor
-
-    # priority
-    if test X"$priority" != X; then
-        set nice -n "$priority" "$@"
-    fi
-
-    action "Starting $daemon" "$@"
-}
-
-DAEMON_CWD=/
-stop_daemon () {
-    if test -e "$rundir/$1.pid"; then
-        if pid=`cat "$rundir/$1.pid"`; then
-            for action in TERM .1 .25 .65 1 1 1 1 KILL 1 1 1 1 FAIL; do
-                case $action in
-                    TERM)
-                        action "Killing $1 ($pid)" kill $pid
-                        ;;
-                    KILL)
-                        action "Killing $1 ($pid) with SIGKILL" kill -9 $pid
-                        ;;
-                    FAIL)
-                        log_failure_msg "Killing $1 ($pid) failed"
-                        return 1
-                        ;;
-                    *)
-                        if pid_exists $pid >/dev/null 2>&1; then
-                            sleep $action
-                        else
-                            return 0
-                        fi
-                        ;;
-                esac
-            done
-        fi
-    fi
-    log_success_msg "$1 is not running"
-}
-
-daemon_status () {
-    pidfile=$rundir/$1.pid
-    if test -e "$pidfile"; then
-        if pid=`cat "$pidfile"`; then
-            if pid_exists "$pid"; then
-                echo "$1 is running with pid $pid"
-                return 0
-            else
-                echo "Pidfile for $1 ($pidfile) is stale"
-            fi
-        else
-            echo "Pidfile for $1 ($pidfile) exists but cannot be read"
-        fi
-    else
-        echo "$1 is not running"
-    fi
-    return 1
-}
-
-daemon_is_running () {
-    pidfile=$rundir/$1.pid
-    test -e "$pidfile" && pid=`cat "$pidfile"` && pid_exists "$pid"
-} >/dev/null 2>&1
diff --git a/xenserver/etc_init.d_openvswitch b/xenserver/etc_init.d_openvswitch
index 8ba8aeeb..c7d0736a 100755
--- a/xenserver/etc_init.d_openvswitch
+++ b/xenserver/etc_init.d_openvswitch
@@ -27,7 +27,7 @@
 # Short-Description: Open vSwitch switch
 ### END INIT INFO
 
-. /usr/share/openvswitch/scripts/ovs-lib.sh || exit 1
+. /usr/share/openvswitch/scripts/ovs-lib || exit 1
 . /etc/xensource-inventory
 test -e /etc/sysconfig/openvswitch && . /etc/sysconfig/openvswitch
 
diff --git a/xenserver/openvswitch-xen.spec b/xenserver/openvswitch-xen.spec
index a53fcc73..4dbc71b1 100644
--- a/xenserver/openvswitch-xen.spec
+++ b/xenserver/openvswitch-xen.spec
@@ -337,7 +337,7 @@ exit 0
 /usr/share/openvswitch/scripts/ovs-bugtool-*
 /usr/share/openvswitch/scripts/ovs-save
 /usr/share/openvswitch/scripts/ovs-ctl
-/usr/share/openvswitch/scripts/ovs-lib.sh
+/usr/share/openvswitch/scripts/ovs-lib
 /usr/share/openvswitch/vswitch.ovsschema
 /usr/sbin/ovs-vlan-bug-workaround
 /usr/sbin/ovs-vswitchd