* [PATCH for-4.7 1/2] init: drop GNU-isms for sleep command
@ 2016-05-05 20:18 Doug Goldstein
2016-05-05 20:18 ` [PATCH for-4.7 2/2] init: shebang should be the first line Doug Goldstein
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Doug Goldstein @ 2016-05-05 20:18 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Wei Liu, Doug Goldstein
Most implementations of the sleep command only take integers. GNU
coreutils has a GNU extension to allow any floating point number to be
passed but we shouldn't depend on that.
Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
---
tools/hotplug/Linux/block-iscsi | 2 +-
tools/hotplug/Linux/init.d/xencommons.in | 4 ++--
tools/hotplug/Linux/init.d/xendriverdomain.in | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/hotplug/Linux/block-iscsi b/tools/hotplug/Linux/block-iscsi
index 8e36852..3615905 100644
--- a/tools/hotplug/Linux/block-iscsi
+++ b/tools/hotplug/Linux/block-iscsi
@@ -74,7 +74,7 @@ find_device()
{
count=0
while [ ! -e /dev/disk/by-path/*"$iqn"-lun-0 ]; do
- sleep 0.1
+ sleep 1
count=`expr $count + 1`
if [ count = 100 ]; then
# 10s timeout while waiting for iSCSI disk to settle
diff --git a/tools/hotplug/Linux/init.d/xencommons.in b/tools/hotplug/Linux/init.d/xencommons.in
index 21e9133..eeac8ab 100644
--- a/tools/hotplug/Linux/init.d/xencommons.in
+++ b/tools/hotplug/Linux/init.d/xencommons.in
@@ -107,14 +107,14 @@ do_stop () {
echo Stopping xenconsoled
if read 2>/dev/null <$XENCONSOLED_PIDFILE pid; then
kill $pid
- while kill -9 $pid >/dev/null 2>&1; do sleep 0.1; done
+ while kill -9 $pid >/dev/null 2>&1; do sleep 1; done
rm -f $XENCONSOLED_PIDFILE
fi
echo Stopping QEMU
if read 2>/dev/null <$QEMU_PIDFILE pid; then
kill $pid
- while kill -9 $pid >/dev/null 2>&1; do sleep 0.1; done
+ while kill -9 $pid >/dev/null 2>&1; do sleep 1; done
rm -f $QEMU_PIDFILE
fi
diff --git a/tools/hotplug/Linux/init.d/xendriverdomain.in b/tools/hotplug/Linux/init.d/xendriverdomain.in
index dd5f3a3..3720dea 100644
--- a/tools/hotplug/Linux/init.d/xendriverdomain.in
+++ b/tools/hotplug/Linux/init.d/xendriverdomain.in
@@ -56,7 +56,7 @@ do_stop () {
echo Stopping xl devd...
if read 2>/dev/null <$XLDEVD_PIDFILE pid; then
kill $pid
- while kill -9 $pid >/dev/null 2>&1; do sleep 0.1; done
+ while kill -9 $pid >/dev/null 2>&1; do sleep 1; done
rm -f $XLDEVD_PIDFILE
fi
}
--
2.7.3
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH for-4.7 2/2] init: shebang should be the first line
2016-05-05 20:18 [PATCH for-4.7 1/2] init: drop GNU-isms for sleep command Doug Goldstein
@ 2016-05-05 20:18 ` Doug Goldstein
2016-05-05 20:57 ` Andrew Cooper
2016-05-05 20:56 ` [PATCH for-4.7 1/2] init: drop GNU-isms for sleep command Andrew Cooper
2016-05-06 10:48 ` Wei Liu
2 siblings, 1 reply; 5+ messages in thread
From: Doug Goldstein @ 2016-05-05 20:18 UTC (permalink / raw)
To: xen-devel; +Cc: Ian Jackson, Wei Liu, Doug Goldstein
The shebang was not on the first line in the init script and it should
be.
Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
---
tools/hotplug/Linux/init.d/xendriverdomain.in | 1 -
1 file changed, 1 deletion(-)
diff --git a/tools/hotplug/Linux/init.d/xendriverdomain.in b/tools/hotplug/Linux/init.d/xendriverdomain.in
index 3720dea..5fd4e9a 100644
--- a/tools/hotplug/Linux/init.d/xendriverdomain.in
+++ b/tools/hotplug/Linux/init.d/xendriverdomain.in
@@ -1,4 +1,3 @@
-
#!/bin/bash
#
# xendriverdomain Script to start services needed in a Xen driver domain
--
2.7.3
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH for-4.7 1/2] init: drop GNU-isms for sleep command
2016-05-05 20:18 [PATCH for-4.7 1/2] init: drop GNU-isms for sleep command Doug Goldstein
2016-05-05 20:18 ` [PATCH for-4.7 2/2] init: shebang should be the first line Doug Goldstein
@ 2016-05-05 20:56 ` Andrew Cooper
2016-05-06 10:48 ` Wei Liu
2 siblings, 0 replies; 5+ messages in thread
From: Andrew Cooper @ 2016-05-05 20:56 UTC (permalink / raw)
To: Doug Goldstein, xen-devel; +Cc: Wei Liu, Ian Jackson
On 05/05/16 21:18, Doug Goldstein wrote:
> Most implementations of the sleep command only take integers. GNU
> coreutils has a GNU extension to allow any floating point number to be
> passed but we shouldn't depend on that.
>
> Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH for-4.7 2/2] init: shebang should be the first line
2016-05-05 20:18 ` [PATCH for-4.7 2/2] init: shebang should be the first line Doug Goldstein
@ 2016-05-05 20:57 ` Andrew Cooper
0 siblings, 0 replies; 5+ messages in thread
From: Andrew Cooper @ 2016-05-05 20:57 UTC (permalink / raw)
To: Doug Goldstein, xen-devel; +Cc: Wei Liu, Ian Jackson
On 05/05/16 21:18, Doug Goldstein wrote:
> The shebang was not on the first line in the init script and it should
> be.
>
> Signed-off-by: Doug Goldstein <cardoe@cardoe.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH for-4.7 1/2] init: drop GNU-isms for sleep command
2016-05-05 20:18 [PATCH for-4.7 1/2] init: drop GNU-isms for sleep command Doug Goldstein
2016-05-05 20:18 ` [PATCH for-4.7 2/2] init: shebang should be the first line Doug Goldstein
2016-05-05 20:56 ` [PATCH for-4.7 1/2] init: drop GNU-isms for sleep command Andrew Cooper
@ 2016-05-06 10:48 ` Wei Liu
2 siblings, 0 replies; 5+ messages in thread
From: Wei Liu @ 2016-05-06 10:48 UTC (permalink / raw)
To: Doug Goldstein; +Cc: Ian Jackson, Wei Liu, xen-devel
Ack + release ack and queued both patches
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-05-06 10:48 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-05 20:18 [PATCH for-4.7 1/2] init: drop GNU-isms for sleep command Doug Goldstein
2016-05-05 20:18 ` [PATCH for-4.7 2/2] init: shebang should be the first line Doug Goldstein
2016-05-05 20:57 ` Andrew Cooper
2016-05-05 20:56 ` [PATCH for-4.7 1/2] init: drop GNU-isms for sleep command Andrew Cooper
2016-05-06 10:48 ` Wei Liu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.