Author: waldi
Date: Sun Apr 22 21:03:41 2012
New Revision: 990
Log:
debian/xen-utils-common.xendomains.init: Remove remaining compat stuff.
Modified:
trunk/xen/debian/xen-utils-common.xendomains.init
Modified: trunk/xen/debian/xen-utils-common.xendomains.init
=============================================================================---
trunk/xen/debian/xen-utils-common.xendomains.init Sun Apr 22 20:57:39 2012
(r989)
+++ trunk/xen/debian/xen-utils-common.xendomains.init Sun Apr 22 21:03:41 2012
(r990)
@@ -36,47 +36,6 @@
shopt -s nullglob
- echo_rc()
- {
- if test ${_RC_RV} = 0; then
- log_success_msg " [${_SMSG[${_RC_RV}]}] "
- else
- log_failure_msg " [${_SMSG[${_RC_RV}]}] "
- fi
- }
-
- rc_reset() { _RC_RV=0; }
- rc_failed()
- {
- if test -z "$1"; then
- _RC_RV=1;
- elif test "$1" != "0"; then
- _RC_RV=$1;
- fi
- return ${_RC_RV}
- }
- rc_check()
- {
- return rc_failed $?
- }
- rc_status()
- {
- rc_failed $?
- if test "$1" = "-r"; then _RC_RV=0; shift; fi
- if test "$1" = "-s"; then rc_failed 5; echo_rc; rc_failed
3; shift; fi
- if test "$1" = "-u"; then rc_failed ${_RC_UNUSED};
echo_rc; rc_failed 3; shift; fi
- if test "$1" = "-v"; then echo_rc; shift; fi
- if test "$1" = "-r"; then _RC_RV=0; shift; fi
- return ${_RC_RV}
- }
- rc_exit() { exit ${_RC_RV}; }
- rc_active()
- {
- if test -z "$RUNLEVEL"; then read RUNLEVEL REST <
<(/sbin/runlevel); fi
- if test -e /etc/init.d/S[0-9][0-9]${1}; then return 0; fi
- return 1
- }
-
if ! which usleep >&/dev/null
then
usleep()
@@ -88,9 +47,6 @@
}
fi
-# Reset status of this service
-rc_reset
-
##
# Returns 0 (success) if the given parameter names a directory, and that
# directory is not empty.
@@ -129,16 +85,6 @@
done
}
-all_zombies()
-{
- while read id name rest; do
- if test "$state" != "-b---d" -a "$state" !=
"-----d"; then
- return 1;
- fi
- done < <(/usr/lib/xen-common/bin/xen-init-list)
- return 0
-}
-
check_running()
{
xen domid "$1" > /dev/null 2>&1
@@ -303,54 +249,29 @@
# not get restarted.
# Commented out to avoid confusion!
-restart()
-{
- do_stop
- do_start
-}
-
-reload()
-{
- restart
-}
-
-
case "$1" in
- start)
- do_start
- rc_status
- if test -f $LOCKFILE; then rc_status -v; fi
- ;;
-
- stop)
- do_stop
- ;;
-
- restart)
- restart
- ;;
- reload|force-reload)
- reload
- ;;
-
- status)
- echo -n "Checking for xendomains:"
- if test ! -f $LOCKFILE; then
- rc_failed 3
- else
- check_all_auto_domains_up
- rc_status
- check_all_saved_domains_up
- rc_status
- fi
- rc_status -v
- ;;
-
- *)
- echo "Usage: $0 {start|stop|restart|reload|force-reload|status}"
- rc_failed 3
- rc_status -v
- ;;
+ start)
+ do_start
+ ;;
+
+ stop)
+ do_stop
+ ;;
+
+ restart)
+ do_stop
+ do_start
+ ;;
+
+ reload|force-reload)
+ do_stop
+ do_start
+ ;;
+
+ *)
+ echo "Usage: $0 {start|stop|restart|reload|force-reload}"
+ exit 3
+ ;;
esac
-rc_exit
+exit 0