aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJustin Pettit <jpettit@nicira.com>2010-01-11 15:31:14 -0800
committerJustin Pettit <jpettit@nicira.com>2010-01-11 16:11:09 -0800
commitf20bbd7ad2e76d8f07b8693ded1f09f6c5aacfd2 (patch)
treeab938f47de39b058715ef00a16d70eb52e1e7c43 /debian
parent6b739e5403d718f0798886ab8f86ae5c4118fc05 (diff)
debian: Fix tab/space issues
Diffstat (limited to 'debian')
-rwxr-xr-xdebian/corekeeper.init12
-rwxr-xr-xdebian/openvswitch-controller.init52
-rwxr-xr-xdebian/openvswitch-monitor.init16
-rwxr-xr-xdebian/openvswitch-switch.init52
-rwxr-xr-xdebian/openvswitch-switch.postrm8
-rwxr-xr-xdebian/openvswitch-switchui.init56
-rwxr-xr-xdebian/openvswitch-wdt.init16
7 files changed, 106 insertions, 106 deletions
diff --git a/debian/corekeeper.init b/debian/corekeeper.init
index d820b028..b7b2d4db 100755
--- a/debian/corekeeper.init
+++ b/debian/corekeeper.init
@@ -42,7 +42,7 @@ set -e
case "$1" in
start)
- log_daemon_msg "Initializing core dump location..."
+ log_daemon_msg "Initializing core dump location..."
if echo "/var/log/core/core.%e.%t.%p" > /proc/sys/kernel/core_pattern
then
log_progress_msg "success"
@@ -52,13 +52,13 @@ case "$1" in
log_end_msg 1
exit 1
fi
- ;;
+ ;;
stop|restart|force-reload|status|reload)
exit 0
;;
*)
- N=/etc/init.d/$NAME
- echo "Usage: $N {start|stop|restart|force-reload|status}" >&2
- exit 1
- ;;
+ N=/etc/init.d/$NAME
+ echo "Usage: $N {start|stop|restart|force-reload|status}" >&2
+ exit 1
+ ;;
esac
diff --git a/debian/openvswitch-controller.init b/debian/openvswitch-controller.init
index ee9c44d5..c5f8eb8f 100755
--- a/debian/openvswitch-controller.init
+++ b/debian/openvswitch-controller.init
@@ -57,7 +57,7 @@ LOGFILE=$LOGDIR/$NAME.log # Server logfile
# Include defaults if available
default=/etc/default/openvswitch-controller
if [ -f $default ] ; then
- . $default
+ . $default
fi
# Check that the user exists (if we set a user)
@@ -142,7 +142,7 @@ start_server() {
$SSL_OPTS
errcode=$?
fi
- return $errcode
+ return $errcode
}
stop_server() {
@@ -158,7 +158,7 @@ stop_server() {
errcode=$?
fi
- return $errcode
+ return $errcode
}
reload_server() {
@@ -171,27 +171,27 @@ reload_server() {
force_stop() {
# Force the process to die killing it manually
- [ ! -e "$PIDFILE" ] && return
- if running ; then
- kill -15 $pid
- # Is it really dead?
- sleep "$DIETIME"s
- if running ; then
- kill -9 $pid
- sleep "$DIETIME"s
- if running ; then
- echo "Cannot kill $NAME (pid=$pid)!"
- exit 1
- fi
- fi
- fi
- rm -f $PIDFILE
+ [ ! -e "$PIDFILE" ] && return
+ if running ; then
+ kill -15 $pid
+ # Is it really dead?
+ sleep "$DIETIME"s
+ if running ; then
+ kill -9 $pid
+ sleep "$DIETIME"s
+ if running ; then
+ echo "Cannot kill $NAME (pid=$pid)!"
+ exit 1
+ fi
+ fi
+ fi
+ rm -f $PIDFILE
}
case "$1" in
start)
- log_daemon_msg "Starting $DESC " "$NAME"
+ log_daemon_msg "Starting $DESC " "$NAME"
# Check if it's running first
if running ; then
log_progress_msg "apparently already running"
@@ -209,7 +209,7 @@ case "$1" in
# a false positive (use 'status' for that)
log_end_msg 1
fi
- ;;
+ ;;
stop)
log_daemon_msg "Stopping $DESC" "$NAME"
if running ; then
@@ -232,7 +232,7 @@ case "$1" in
force_stop
log_end_msg $?
fi
- ;;
+ ;;
restart|force-reload)
log_daemon_msg "Restarting $DESC" "$NAME"
stop_server
@@ -241,7 +241,7 @@ case "$1" in
start_server
running
log_end_msg $?
- ;;
+ ;;
status)
log_daemon_msg "Checking status of $DESC" "$NAME"
@@ -260,10 +260,10 @@ case "$1" in
log_warning_msg "cannot re-read the config file (use restart)."
;;
*)
- N=/etc/init.d/$NAME
- echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2
- exit 1
- ;;
+ N=/etc/init.d/$NAME
+ echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2
+ exit 1
+ ;;
esac
exit 0
diff --git a/debian/openvswitch-monitor.init b/debian/openvswitch-monitor.init
index 8c7e1ad0..d83dabc4 100755
--- a/debian/openvswitch-monitor.init
+++ b/debian/openvswitch-monitor.init
@@ -56,7 +56,7 @@ DODTIME=10 # Time to wait for the daemon to die, in seconds
# Include defaults if available
if [ -f /etc/default/$NAME ] ; then
- . /etc/default/$NAME
+ . /etc/default/$NAME
fi
set -e
@@ -105,7 +105,7 @@ stop_daemon() {
case "$1" in
start)
- log_daemon_msg "Starting $DESC " "$NAME"
+ log_daemon_msg "Starting $DESC " "$NAME"
# Check if it's running first
if running ; then
log_progress_msg "apparently already running"
@@ -123,7 +123,7 @@ case "$1" in
# a false positive (use 'status' for that)
log_end_msg 1
fi
- ;;
+ ;;
stop)
log_daemon_msg "Stopping $DESC" "$NAME"
if running ; then
@@ -147,7 +147,7 @@ case "$1" in
start_daemon
running
log_end_msg $?
- ;;
+ ;;
status)
log_daemon_msg "Checking status of $DESC" "$NAME"
if running ; then
@@ -165,10 +165,10 @@ case "$1" in
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
- ;;
+ 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-switch.init b/debian/openvswitch-switch.init
index bb2cb1bf..5d37d707 100755
--- a/debian/openvswitch-switch.init
+++ b/debian/openvswitch-switch.init
@@ -35,7 +35,7 @@ unset OVS_VSWITCHD_OPTS
unset CORE_LIMIT
default=/etc/default/openvswitch-switch
if [ -f $default ] ; then
- . $default
+ . $default
fi
set -e
@@ -217,9 +217,9 @@ case "$1" in
set -- "$@" --remote punix:/var/run/ovsdb-server
set -- "$@" /etc/openvswitch-switch/conf
set -- "$@" $OVSDB_SERVER_OPTS
- echo -n "Starting ovsdb-server: "
- start-stop-daemon --start --quiet --pidfile /var/run/ovsdb-server.pid \
- --exec $ovsdb_server -- "$@"
+ echo -n "Starting ovsdb-server: "
+ start-stop-daemon --start --quiet --pidfile /var/run/ovsdb-server.pid \
+ --exec $ovsdb_server -- "$@"
if running ovsdb-server; then
echo "ovsdb-server."
else
@@ -235,30 +235,30 @@ case "$1" in
set -- "$@" --detach --pidfile
set -- "$@" unix:/var/run/ovsdb-server
set -- "$@" $OVS_VSWITCHD_OPTS
- echo -n "Starting ovs-vswitchd: "
- start-stop-daemon --start --quiet --pidfile /var/run/ovs-vswitchd.pid \
- --exec $ovs_vswitchd -- "$@"
+ echo -n "Starting ovs-vswitchd: "
+ start-stop-daemon --start --quiet --pidfile /var/run/ovs-vswitchd.pid \
+ --exec $ovs_vswitchd -- "$@"
if running ovs-vswitchd; then
echo "ovs-vswitchd."
else
echo " ERROR."
fi
- ;;
+ ;;
stop)
- echo -n "Stopping ovs-vswitchd: "
- start-stop-daemon --stop --quiet --oknodo \
+ echo -n "Stopping ovs-vswitchd: "
+ start-stop-daemon --stop --quiet --oknodo \
--pidfile /var/run/ovs-vswitchd.pid \
--exec $ovs_vswitchd
- echo "ovs-vswitchd."
+ echo "ovs-vswitchd."
- echo -n "Stopping ovsdb-server: "
- start-stop-daemon --stop --quiet --oknodo \
+ echo -n "Stopping ovsdb-server: "
+ start-stop-daemon --stop --quiet --oknodo \
--pidfile /var/run/ovsdb-server.pid \
--exec $ovsdb_server
- echo "ovsdb-server."
- ;;
+ echo "ovsdb-server."
+ ;;
force-stop)
- echo -n "Forcefully stopping ovs-vswitchd: "
+ echo -n "Forcefully stopping ovs-vswitchd: "
force_stop ovs-vswitchd
if ! running ovs-vswitchd; then
echo "ovs-vswitchd."
@@ -266,28 +266,28 @@ case "$1" in
echo " ERROR."
fi
- echo -n "Forcefully stopping ovsdb-server: "
+ echo -n "Forcefully stopping ovsdb-server: "
force_stop ovsdb-server
if ! running ovsdb-server; then
echo "ovsdb-server."
else
echo " ERROR."
fi
- ;;
+ ;;
unload)
- unload_modules
- ;;
+ unload_modules
+ ;;
reload)
;;
force-reload)
# Nothing to do, since ovs-vswitchd automatically reloads
# whenever its configuration changes, and ovsdb-server doesn't
# have anything to reload.
- ;;
+ ;;
restart)
$0 stop || true
$0 start
- ;;
+ ;;
status)
for daemon in ovs-vswitchd ovsdb-server; do
echo -n "$daemon is "
@@ -300,10 +300,10 @@ case "$1" in
done
;;
*)
- N=/etc/init.d/$NAME
- echo "Usage: $N {start|stop|restart|force-reload|status|force-stop|unload}" >&2
- exit 1
- ;;
+ N=/etc/init.d/$NAME
+ echo "Usage: $N {start|stop|restart|force-reload|status|force-stop|unload}" >&2
+ exit 1
+ ;;
esac
exit 0
diff --git a/debian/openvswitch-switch.postrm b/debian/openvswitch-switch.postrm
index 6ff5ec2c..e4a736a2 100755
--- a/debian/openvswitch-switch.postrm
+++ b/debian/openvswitch-switch.postrm
@@ -23,17 +23,17 @@ case "$1" in
purge)
rm -f /etc/openvswitch-switch/conf
rm -f /etc/openvswitch-switch/.conf.~lock~
- rm -f /etc/default/openvswitch-switch
+ rm -f /etc/default/openvswitch-switch
rm -f /var/log/openvswitch/*
- ;;
+ ;;
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- ;;
+ ;;
*)
echo "postrm called with unknown argument \`$1'" >&2
exit 1
- ;;
+ ;;
esac
# dh_installdeb will replace this with shell code automatically
diff --git a/debian/openvswitch-switchui.init b/debian/openvswitch-switchui.init
index 7a02c5ea..7ecb14ae 100755
--- a/debian/openvswitch-switchui.init
+++ b/debian/openvswitch-switchui.init
@@ -56,7 +56,7 @@ DODTIME=10 # Time to wait for the server to die, in seconds
# Include defaults if available
if [ -f /etc/default/$NAME ] ; then
- . /etc/default/$NAME
+ . /etc/default/$NAME
fi
set -e
@@ -99,10 +99,10 @@ start_server() {
# Wait up to 3 seconds for the daemon to start.
for i in 1 2 3; do
- if running; then
- break
- fi
- sleep 1
+ if running; then
+ break
+ fi
+ sleep 1
done
}
@@ -112,27 +112,27 @@ stop_server() {
force_stop() {
# Force the process to die killing it manually
- [ ! -e "$PIDFILE" ] && return
- if running ; then
- kill -15 $pid
- # Is it really dead?
- sleep "$DIETIME"s
- if running ; then
- kill -9 $pid
- sleep "$DIETIME"s
- if running ; then
- echo "Cannot kill $NAME (pid=$pid)!"
- exit 1
- fi
- fi
- fi
- rm -f $PIDFILE
+ [ ! -e "$PIDFILE" ] && return
+ if running ; then
+ kill -15 $pid
+ # Is it really dead?
+ sleep "$DIETIME"s
+ if running ; then
+ kill -9 $pid
+ sleep "$DIETIME"s
+ if running ; then
+ echo "Cannot kill $NAME (pid=$pid)!"
+ exit 1
+ fi
+ fi
+ fi
+ rm -f $PIDFILE
}
case "$1" in
start)
- log_daemon_msg "Starting $DESC " "$NAME"
+ log_daemon_msg "Starting $DESC " "$NAME"
# Check if it's running first
if running ; then
log_progress_msg "apparently already running"
@@ -150,7 +150,7 @@ case "$1" in
# a false positive (use 'status' for that)
log_end_msg 1
fi
- ;;
+ ;;
stop)
log_daemon_msg "Stopping $DESC" "$NAME"
if running ; then
@@ -173,7 +173,7 @@ case "$1" in
force_stop
log_end_msg $?
fi
- ;;
+ ;;
restart|force-reload)
log_daemon_msg "Restarting $DESC" "$NAME"
stop_server
@@ -182,7 +182,7 @@ case "$1" in
start_server
running
log_end_msg $?
- ;;
+ ;;
status)
log_daemon_msg "Checking status of $DESC" "$NAME"
@@ -201,10 +201,10 @@ case "$1" in
log_warning_msg "cannot re-read the config file (use restart)."
;;
*)
- N=/etc/init.d/$NAME
- echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2
- exit 1
- ;;
+ N=/etc/init.d/$NAME
+ echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2
+ exit 1
+ ;;
esac
exit 0
diff --git a/debian/openvswitch-wdt.init b/debian/openvswitch-wdt.init
index b1c0ec5e..e2541153 100755
--- a/debian/openvswitch-wdt.init
+++ b/debian/openvswitch-wdt.init
@@ -56,7 +56,7 @@ DODTIME=10 # Time to wait for the daemon to die, in seconds
# Include defaults if available
if [ -f /etc/default/$NAME ] ; then
- . /etc/default/$NAME
+ . /etc/default/$NAME
fi
set -e
@@ -107,7 +107,7 @@ stop_daemon() {
case "$1" in
start)
- log_daemon_msg "Starting $DESC " "$NAME"
+ log_daemon_msg "Starting $DESC " "$NAME"
# Check if it's running first
if running ; then
log_progress_msg "apparently already running"
@@ -125,7 +125,7 @@ case "$1" in
# a false positive (use 'status' for that)
log_end_msg 1
fi
- ;;
+ ;;
stop)
log_daemon_msg "Stopping $DESC" "$NAME"
if running ; then
@@ -149,7 +149,7 @@ case "$1" in
start_daemon
running
log_end_msg $?
- ;;
+ ;;
status)
log_daemon_msg "Checking status of $DESC" "$NAME"
if running ; then
@@ -167,10 +167,10 @@ case "$1" in
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
- ;;
+ N=/etc/init.d/$NAME
+ echo "Usage: $N {start|stop|restart|force-reload|status}" >&2
+ exit 1
+ ;;
esac
exit 0