From: "Luis R. Rodriguez" <mcgrof@do-not-panic.com>
To: xen-devel@lists.xenproject.org
Cc: "Ian Campbell" <ian.campbell@citrix.com>,
"Stefano Stabellini" <stefano.stabellini@eu.citrix.com>,
"Luis R. Rodriguez" <mcgrof@suse.com>,
"Jan Rękorajski" <baggins@pld-linux.org>,
"Ian Jackson" <ian.jackson@eu.citrix.com>,
"Jacek Konieczny" <jajcus@jajcus.net>,
"M A Young" <m.a.young@durham.ac.uk>
Subject: [PATCH v2 5/7] tools/xendomains: do space cleanups
Date: Wed, 19 Mar 2014 13:58:51 -0700 [thread overview]
Message-ID: <1395262733-11885-6-git-send-email-mcgrof@do-not-panic.com> (raw)
In-Reply-To: <1395262733-11885-1-git-send-email-mcgrof@do-not-panic.com>
From: "Luis R. Rodriguez" <mcgrof@suse.com>
This has no functional changes. This is just to prepare the file
to be moved, so you won't blind your eyes or get git am to complain.
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Jan Rękorajski <baggins@pld-linux.org>
Cc: M A Young <m.a.young@durham.ac.uk>
Cc: Jacek Konieczny <jajcus@jajcus.net>
Cc: xen-devel@lists.xenproject.org
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
---
tools/hotplug/Linux/init.d/xendomains | 64 +++++++++++++++++------------------
1 file changed, 32 insertions(+), 32 deletions(-)
diff --git a/tools/hotplug/Linux/init.d/xendomains b/tools/hotplug/Linux/init.d/xendomains
index fac85ba..3d68e07 100644
--- a/tools/hotplug/Linux/init.d/xendomains
+++ b/tools/hotplug/Linux/init.d/xendomains
@@ -23,7 +23,7 @@
# Default-Start: 2 3 5
# Default-Stop: 0 1 6
# Short-Description: Start/stop secondary xen domains
-# Description: Start / stop domains automatically when domain 0
+# Description: Start / stop domains automatically when domain 0
# boots / shuts down.
### END INIT INFO
@@ -44,7 +44,7 @@ then
exit 0;
fi
-# Correct exit code would probably be 5, but it's enough
+# Correct exit code would probably be 5, but it's enough
# if xend complains if we're not running as privileged domain
if ! [ -e /proc/xen/privcmd ]; then
exit 0
@@ -74,7 +74,7 @@ test -r $XENDOM_CONFIG || { echo "$XENDOM_CONFIG not existing";
if test -e /etc/rc.status; then
# SUSE rc script library
. /etc/rc.status
-else
+else
_cmd=$1
declare -a _SMSG
if test "${_cmd}" = "status"; then
@@ -85,8 +85,8 @@ else
_RC_UNUSED=6
fi
if test -e /lib/lsb/init-functions; then
- # LSB
- . /lib/lsb/init-functions
+ # LSB
+ . /lib/lsb/init-functions
if alias log_success_msg >/dev/null 2>/dev/null; then
echo_rc()
{
@@ -102,7 +102,7 @@ else
fi
}
fi
- else
+ else
# emulate it
echo_rc()
{
@@ -112,17 +112,17 @@ else
rc_reset() { _RC_RV=0; }
rc_failed()
{
- if test -z "$1"; then
+ if test -z "$1"; then
_RC_RV=1;
- elif test "$1" != "0"; then
- _RC_RV=$1;
- fi
+ elif test "$1" != "0"; then
+ _RC_RV=$1;
+ fi
return ${_RC_RV}
}
rc_check()
{
return rc_failed $?
- }
+ }
rc_status()
{
rc_failed $?
@@ -134,7 +134,7 @@ else
return ${_RC_RV}
}
rc_exit() { exit ${_RC_RV}; }
- rc_active()
+ 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
@@ -181,13 +181,13 @@ rdnames()
{
NAMES=
if ! contains_something "$XENDOMAINS_AUTO"
- then
+ then
return
fi
for dom in $XENDOMAINS_AUTO/*; do
rdname $dom
- if test -z $NAMES; then
- NAMES=$NM;
+ if test -z $NAMES; then
+ NAMES=$NM;
else
NAMES="$NAMES|$NM"
fi
@@ -220,7 +220,7 @@ is_running()
while read LN; do
parseln "$LN" || continue
if test $id = 0; then continue; fi
- case $name in
+ case $name in
($NM)
RC=0
;;
@@ -229,11 +229,11 @@ is_running()
return $RC
}
-start()
+start()
{
- if [ -f $LOCKFILE ]; then
+ if [ -f $LOCKFILE ]; then
echo -e "xendomains already running (lockfile exists)"
- return;
+ return;
fi
saved_domains=" "
@@ -273,10 +273,10 @@ start()
# XENDOMAINS_AUTO - they could just be symlinks to files elsewhere
# Create all domains with config files in XENDOMAINS_AUTO.
- # TODO: We should record which domain name belongs
+ # TODO: We should record which domain name belongs
# so we have the option to selectively shut down / migrate later
# If a domain statefile from $XENDOMAINS_SAVE matches a domain name
- # in $XENDOMAINS_AUTO, do not try to start that domain; if it didn't
+ # in $XENDOMAINS_AUTO, do not try to start that domain; if it didn't
# restore correctly it requires administrative attention.
for dom in $XENDOMAINS_AUTO/*; do
echo -n " ${dom##*/}"
@@ -337,14 +337,14 @@ watchdog_xencmd()
read PSF PSUID PSPID PSPPID < <(echo "$PSAX")
# kill $CMD $1
kill $PSPID >/dev/null 2>&1
-
+
echo -e .
}
stop()
{
exec 3>&2 2> /dev/null
-
+
# Collect list of domains to shut down
if test "$XENDOMAINS_AUTO_ONLY" = "true"; then
rdnames
@@ -368,7 +368,7 @@ stop()
esac
"
fi
- # XENDOMAINS_SYSRQ chould be something like just "s"
+ # XENDOMAINS_SYSRQ chould be something like just "s"
# or "s e i u" or even "s e s i u o"
# for the latter, you should set XENDOMAINS_USLEEP to 1200000 or so
if test -n "$XENDOMAINS_SYSRQ"; then
@@ -401,7 +401,7 @@ stop()
kill $WDOG_PID >/dev/null 2>&1
else
kill $WDOG_PID >/dev/null 2>&1
-
+
echo -e .
usleep 1000
continue
@@ -460,7 +460,7 @@ stop()
# Unconditionally delete lock file
rm -f $LOCKFILE
-
+
exec 2>&3
}
@@ -470,7 +470,7 @@ check_domain_up()
while read LN; do
parseln "$LN" || continue
if test $id = 0; then continue; fi
- case $name in
+ case $name in
($1)
return 0
;;
@@ -489,9 +489,9 @@ check_all_auto_domains_up()
for nm in $XENDOMAINS_AUTO/*; do
rdname $nm
found=0
- if check_domain_up "$NM"; then
+ if check_domain_up "$NM"; then
echo -n " $name"
- else
+ else
missing="$missing $NM"
fi
done
@@ -504,7 +504,7 @@ check_all_auto_domains_up()
check_all_saved_domains_up()
{
- if ! contains_something "$XENDOMAINS_SAVE"
+ if ! contains_something "$XENDOMAINS_SAVE"
then
return 0
fi
@@ -551,8 +551,8 @@ case "$1" in
;;
status)
- echo -n "Checking for xendomains:"
- if test ! -f $LOCKFILE; then
+ echo -n "Checking for xendomains:"
+ if test ! -f $LOCKFILE; then
rc_failed 3
else
check_all_auto_domains_up
--
1.9.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2014-03-19 20:59 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-19 20:58 [PATCH v2 0/7] xen: add systemd files Luis R. Rodriguez
2014-03-19 20:58 ` [PATCH v2 1/7] xenstore-read: add support for a retry open limit on xenstored Luis R. Rodriguez
2014-03-21 15:21 ` Ian Campbell
2014-03-21 15:22 ` Ian Jackson
2014-03-22 1:36 ` Luis R. Rodriguez
2014-03-22 1:33 ` Luis R. Rodriguez
2014-03-24 9:57 ` Ian Campbell
2014-03-21 15:40 ` David Vrabel
2014-03-21 16:01 ` Ian Campbell
2014-03-22 1:43 ` Luis R. Rodriguez
2014-03-24 10:01 ` Ian Campbell
2014-03-22 1:41 ` Luis R. Rodriguez
2014-03-19 20:58 ` [PATCH v2 2/7] xencommons: use the retry limit instead of implementing our own timeout Luis R. Rodriguez
2014-03-21 15:24 ` Ian Campbell
2014-03-19 20:58 ` [PATCH v2 3/7] tools/xendomains: make xl the default Luis R. Rodriguez
2014-03-21 15:26 ` Ian Campbell
2014-03-19 20:58 ` [PATCH v2 4/7] tools/xendomains: remove old redhat check Luis R. Rodriguez
2014-03-21 15:28 ` Ian Campbell
2014-03-22 1:56 ` Luis R. Rodriguez
2014-03-19 20:58 ` Luis R. Rodriguez [this message]
2014-03-21 15:29 ` [PATCH v2 5/7] tools/xendomains: do space cleanups Ian Campbell
2014-03-19 20:58 ` [PATCH v2 6/7] tools/xendomains: move to sbin and use init helper Luis R. Rodriguez
2014-03-19 22:03 ` Olaf Hering
2014-03-22 2:00 ` Luis R. Rodriguez
2014-03-21 15:34 ` Ian Campbell
2014-03-22 2:17 ` Luis R. Rodriguez
2014-03-24 10:09 ` Ian Campbell
2014-04-28 5:11 ` Luis R. Rodriguez
2014-04-28 9:15 ` Ian Campbell
2014-04-28 10:47 ` Luis R. Rodriguez
2014-03-19 20:58 ` [PATCH v2 7/7] systemd: add support initial xen systemd service files Luis R. Rodriguez
2014-03-19 21:05 ` Luis R. Rodriguez
2014-03-21 10:08 ` Ian Campbell
2014-03-22 2:26 ` Luis R. Rodriguez
2014-03-24 10:11 ` Ian Campbell
2014-03-24 16:36 ` Luis R. Rodriguez
2014-04-28 5:12 ` Luis R. Rodriguez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1395262733-11885-6-git-send-email-mcgrof@do-not-panic.com \
--to=mcgrof@do-not-panic.com \
--cc=baggins@pld-linux.org \
--cc=ian.campbell@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=jajcus@jajcus.net \
--cc=m.a.young@durham.ac.uk \
--cc=mcgrof@suse.com \
--cc=stefano.stabellini@eu.citrix.com \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).