[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-changelog] [xen master] init: drop GNU-isms for sleep command



commit 4ca9d5dbf0a849ebc808afa89070776577138d11
Author:     Doug Goldstein <cardoe@xxxxxxxxxx>
AuthorDate: Thu May 5 15:18:08 2016 -0500
Commit:     Wei Liu <wei.liu2@xxxxxxxxxx>
CommitDate: Fri May 6 12:00:22 2016 +0100

    init: drop GNU-isms for sleep command
    
    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@xxxxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
    Release-acked-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
 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
 }
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.