Author: waldi
Date: Sat Apr 14 12:47:49 2012
New Revision: 977
Log:
debian/xen-utils-common.xen.init: Reorder variable init.
Modified:
trunk/xen/debian/xen-utils-common.xen.init
Modified: trunk/xen/debian/xen-utils-common.xen.init
=============================================================================---
trunk/xen/debian/xen-utils-common.xen.init Sat Apr 14 12:44:41 2012 (r976)
+++ trunk/xen/debian/xen-utils-common.xen.init Sat Apr 14 12:47:49 2012 (r977)
@@ -9,12 +9,18 @@
# Description: Xen daemons
### END INIT INFO
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-DESC="Xen daemons"
-
. /lib/init/vars.sh
. /lib/lsb/init-functions
+# Default variables
+XENSTORED_DIR="/var/run/xenstored"
+
+[ -r /etc/default/xen ] && . /etc/default/xen
+[ -r /etc/default/xend ] && . /etc/default/xend
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+DESC="Xen daemons"
+
ROOT=$(/usr/lib/xen-common/bin/xen-dir 2>/dev/null)
if [ $? -ne 0 ]; then
log_warning_msg "Not running within Xen or no compatible utils"
@@ -30,11 +36,8 @@
XENCONSOLED="$ROOT"/bin/xenconsoled
XENCONSOLED_PIDFILE="/var/run/xenconsoled.pid"
XENSTORED="$ROOT"/bin/xenstored
-XENSTORED_DIR="/var/run/xenstored"
XENSTORED_PIDFILE="/var/run/xenstore.pid"
-[ -r /etc/default/xend ] && . /etc/default/xend
-
modules_setup()
{
modprobe xenfs 2>/dev/null