diff options
author | Ben Pfaff <blp@nicira.com> | 2010-08-25 09:59:26 -0700 |
---|---|---|
committer | Ben Pfaff <blp@nicira.com> | 2010-08-25 10:03:41 -0700 |
commit | eb07240a2a1265f705500a0a54c2f1c4bd83af83 (patch) | |
tree | 6252832108a2b85c28d0f28fb842a36e3428a671 /debian | |
parent | 1f0af7586e9ffbdbafe00344aca56cd2663b1f62 (diff) |
utilities: Remove ovs-wdt.
We used ovs-wdt at Nicira for a while when we were working on building
hardware switches. We don't use it anymore, so remove it from the tree.
CC: Simon Horman <horms@verge.net.au>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'debian')
-rw-r--r-- | debian/.gitignore | 1 | ||||
-rw-r--r-- | debian/automake.mk | 4 | ||||
-rw-r--r-- | debian/control | 8 | ||||
-rw-r--r-- | debian/openvswitch-wdt.default | 24 | ||||
-rw-r--r-- | debian/openvswitch-wdt.dirs | 2 | ||||
-rwxr-xr-x | debian/openvswitch-wdt.init | 176 | ||||
-rw-r--r-- | debian/openvswitch-wdt.install | 1 |
7 files changed, 0 insertions, 216 deletions
diff --git a/debian/.gitignore b/debian/.gitignore index aa8169b2..3a6b6bb8 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -16,4 +16,3 @@ /openvswitch-switch /openvswitch-switch-config /openvswitch-switch.copyright -/openvswitch-wdt diff --git a/debian/automake.mk b/debian/automake.mk index c8b791b4..51eeed5a 100644 --- a/debian/automake.mk +++ b/debian/automake.mk @@ -42,10 +42,6 @@ EXTRA_DIST += \ debian/openvswitch-switch.postinst \ debian/openvswitch-switch.postrm \ debian/openvswitch-switch.template \ - debian/openvswitch-wdt.default \ - debian/openvswitch-wdt.dirs \ - debian/openvswitch-wdt.init \ - debian/openvswitch-wdt.install \ debian/ovs-switch-setup \ debian/ovs-switch-setup.8 \ debian/po/POTFILES.in \ diff --git a/debian/control b/debian/control index 32a8fca1..80336e56 100644 --- a/debian/control +++ b/debian/control @@ -98,11 +98,3 @@ Description: Debug symbols for Open vSwitch packages This package contains the debug symbols for all the other openvswitch-* packages. Install it to debug one of them or to examine a core dump produced by one of them. - -Package: openvswitch-wdt -Architecture: any -Recommends: openvswitch-switch -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Watchdog utility for Open vSwitch switches - The ovs-wdt program included in this package manages the hardware - watchdog timer in switches based on the Portwell NAR-5520 hardware. diff --git a/debian/openvswitch-wdt.default b/debian/openvswitch-wdt.default deleted file mode 100644 index 35625d45..00000000 --- a/debian/openvswitch-wdt.default +++ /dev/null @@ -1,24 +0,0 @@ -# This is a POSIX shell fragment -*- sh -*- - -# To configure the Open vSwitch reliability packages, modify the following. -# Afterward, the watchdog timer and oops handling will be configured -# automatically at boot time. It can be started immediately with -# /etc/init.d/openvswitch-wdt start - -# Defaults for initscript -# sourced by /etc/init.d/openvswitch-wdt -# installed at /etc/default/openvswitch-wdt by the maintainer scripts - -# OOPS_REBOOT_TIME: The number of seconds the system should wait until it -# reboots when the kernel oops. A value of zero causes the system to -# wait forever. -OOPS_REBOOT_TIME=1 - -# WDT_TIMEOUT: The number of seconds the watchdog timer should wait until -# it reboots the system when it hasn't received a keep-alive. A value -# of zero disables the watchdog timer. -WDT_TIMEOUT=30 - -# WDT_INTERVAL: The number of seconds to wait between sending keep-alive -# messages to the watchdog timer. -WDT_INTERVAL=1 diff --git a/debian/openvswitch-wdt.dirs b/debian/openvswitch-wdt.dirs deleted file mode 100644 index ca882bbb..00000000 --- a/debian/openvswitch-wdt.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin -usr/sbin diff --git a/debian/openvswitch-wdt.init b/debian/openvswitch-wdt.init deleted file mode 100755 index 06d8fccc..00000000 --- a/debian/openvswitch-wdt.init +++ /dev/null @@ -1,176 +0,0 @@ -#!/bin/sh -# -# Example init.d script with LSB support. -# -# Please read this init.d carefully and modify the sections to -# adjust it to the program you want to run. -# -# Copyright (c) 2007, 2009 Javier Fernandez-Sanguino <jfs@debian.org> -# -# This is free software; you may redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2, -# or (at your option) any later version. -# -# This is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License with -# the Debian operating system, in /usr/share/common-licenses/GPL; if -# not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA -# -### BEGIN INIT INFO -# Provides: openvswitch-wdt -# Required-Start: $network $local_fs $remote_fs -# Required-Stop: $remote_fs -# Should-Start: $named $syslog openvswitch-switch -# Should-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: Open vSwitch switch watchdog -### END INIT INFO - -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin - -DAEMON=/usr/sbin/ovs-wdt -NAME=openvswitch-wdt -DESC="Open vSwitch watchdog" - -PIDFILE=/var/run/openvswitch/$NAME.pid - -test -x $DAEMON || exit 0 - -. /lib/lsb/init-functions - -# Default options, these can be overriden by the information -# at /etc/default/$NAME -DAEMON_OPTS="" # Additional options given to the daemon - -DODTIME=10 # Time to wait for the daemon to die, in seconds - # If this value is set too low you might not - # let some daemons to die gracefully and - # 'restart' will not work - -# Include defaults if available -if [ -f /etc/default/$NAME ] ; then - . /etc/default/$NAME -fi - -set -e - -running_pid() { -# Check if a given process pid's cmdline matches a given name - pid=$1 - name=$2 - [ -z "$pid" ] && return 1 - [ ! -d /proc/$pid ] && return 1 - return 0 -} - -running() { -# Check if the process is running looking at /proc -# (works for all users) - - # No pidfile, probably no daemon present - [ ! -f "$PIDFILE" ] && return 1 - pid=`cat $PIDFILE` - running_pid $pid $DAEMON || return 1 - return 0 -} - -start_daemon() { -# Start the process using the wrapper - if test $WDT_TIMEOUT != 0; then - start-stop-daemon --start --quiet -m --background --pidfile $PIDFILE \ - --exec $DAEMON -- --timeout=$WDT_TIMEOUT --interval=$WDT_INTERVAL $DAEMON_OPTS - fi - - # Wait up to 3 seconds for the daemon to start. - for i in 1 2 3; do - if running; then - break - fi - sleep 1 - done - - echo $OOPS_REBOOT_TIME > /proc/sys/kernel/panic - echo 1 > /proc/sys/kernel/panic_on_oops -} - -stop_daemon() { - start-stop-daemon -o --stop --pidfile $PIDFILE - rm $PIDFILE -} - -case "$1" in - start) - log_daemon_msg "Starting $DESC " "$NAME" - # Check if it's running first - if running ; then - log_progress_msg "apparently already running" - log_end_msg 0 - exit 0 - fi - if start_daemon && running ; then - # It's ok, the daemon started and is running - log_end_msg 0 - else - # Either we could not start it or it is not running - # after we did - # NOTE: Some daemons might die some time after they start, - # this code does not try to detect this and might give - # a false positive (use 'status' for that) - log_end_msg 1 - fi - ;; - stop) - log_daemon_msg "Stopping $DESC" "$NAME" - if running ; then - # Only stop the daemon if we see it running - stop_daemon - log_end_msg $? - else - # If it's not running don't do anything - log_progress_msg "apparently not running" - log_end_msg 0 - exit 0 - fi - ;; - restart|force-reload) - log_daemon_msg "Restarting $DESC" "$NAME" - if running ; then - stop_daemon - # Wait some sensible amount, some daemons need this - [ -n "$DIETIME" ] && sleep $DIETIME - fi - start_daemon - running - log_end_msg $? - ;; - status) - log_daemon_msg "Checking status of $DESC" "$NAME" - if running ; then - log_progress_msg "running" - log_end_msg 0 - else - log_progress_msg "apparently not running" - log_end_msg 1 - exit 1 - fi - ;; - # Use this if the daemon cannot reload - reload) - log_warning_msg "Reloading $NAME daemon: not implemented, as the daemon" - log_warning_msg "cannot re-read the config file (use restart)." - ;; - *) - N=/etc/init.d/$NAME - echo "Usage: $N {start|stop|restart|force-reload|status}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/debian/openvswitch-wdt.install b/debian/openvswitch-wdt.install deleted file mode 100644 index 80a04e13..00000000 --- a/debian/openvswitch-wdt.install +++ /dev/null @@ -1 +0,0 @@ -_debian/utilities/ovs-wdt usr/sbin |