[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, experimental, updated. debian/0.9.11_rc1-1

[Guido Günther]

The following commit has been merged in the experimental branch:
commit 697838ff5690c9f71dcc07e0aa4480ef67247a65
Author: Guido Günther <agx at sigxcpu.org>
Date:   Mon Mar 26 21:03:55 2012 +0200

    Update Debianize-libvirt-guests.patch
    
    with new config option PARALLEL_SHUTDOWN

diff --git a/debian/patches/debian/Debianize-libvirt-guests.patch b/debian/patches/debian/Debianize-libvirt-guests.patch
index 3b66576..4918291 100644
--- a/debian/patches/debian/Debianize-libvirt-guests.patch
+++ b/debian/patches/debian/Debianize-libvirt-guests.patch
@@ -4,13 +4,14 @@ Subject: Debianize libvirt-guests
 
 Origin: vendor
 
+
 ---
- tools/libvirt-guests.init.sh |   43 +++++++++++++----------------------------
- tools/libvirt-guests.sysconf |    6 ++--
- 2 files changed, 17 insertions(+), 32 deletions(-)
+ tools/libvirt-guests.init.sh |   41 +++++++++++++----------------------------
+ tools/libvirt-guests.sysconf |    4 ++--
+ 2 files changed, 15 insertions(+), 30 deletions(-)
 
 diff --git a/tools/libvirt-guests.init.sh b/tools/libvirt-guests.init.sh
-index 367177e..43f35c9 100644
+index aafb4d4..386ee91 100644
 --- a/tools/libvirt-guests.init.sh
 +++ b/tools/libvirt-guests.init.sh
 @@ -4,8 +4,8 @@
@@ -24,7 +25,7 @@ index 367177e..43f35c9 100644
  # Default-Start: 2 3 4 5
  # Default-Stop: 0 1 6
  # Short-Description: suspend/resume libvirt guests on shutdown/boot
-@@ -14,42 +14,28 @@
+@@ -14,43 +14,29 @@
  #              See http://libvirt.org
  ### END INIT INFO
  
@@ -60,10 +61,10 @@ index 367177e..43f35c9 100644
  URIS=default
 -ON_BOOT=start
 -ON_SHUTDOWN=suspend
--SHUTDOWN_TIMEOUT=0
 +ON_BOOT=ignore
 +ON_SHUTDOWN=shutdown
-+SHUTDOWN_TIMEOUT=30
+ SHUTDOWN_TIMEOUT=300
+ PARALLEL_SHUTDOWN=0
  START_DELAY=0
  BYPASS_CACHE=0
  
@@ -78,7 +79,7 @@ index 367177e..43f35c9 100644
  
  RETVAL=0
  
-@@ -316,8 +302,7 @@ gueststatus() {
+@@ -499,8 +485,7 @@ gueststatus() {
  
  # rh_status
  # Display current status: whether saved state exists, and whether start
@@ -89,7 +90,7 @@ index 367177e..43f35c9 100644
      if [ -f "$LISTFILE" ]; then
          gettext "stopped, with saved guests"; echo
 diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf
-index 9b8b64f..e0644db 100644
+index d1f2051..1173760 100644
 --- a/tools/libvirt-guests.sysconf
 +++ b/tools/libvirt-guests.sysconf
 @@ -8,7 +8,7 @@
@@ -99,18 +100,14 @@ index 9b8b64f..e0644db 100644
 -#ON_BOOT=start
 +#ON_BOOT=ignore
  
- # number of seconds to wait between each guest start
- #START_DELAY=0
-@@ -21,10 +21,10 @@
+ # Number of seconds to wait between each guest start. Set to 0 to allow
+ # parallel startup.
+@@ -22,7 +22,7 @@
  #             which just needs a long time to shutdown. When setting
  #             ON_SHUTDOWN=shutdown, you must also set SHUTDOWN_TIMEOUT to a
  #             value suitable for your guests.
 -#ON_SHUTDOWN=suspend
 +#ON_SHUTDOWN=shutdown
  
- # number of seconds we're willing to wait for a guest to shut down
--#SHUTDOWN_TIMEOUT=0
-+#SHUTDOWN_TIMEOUT=30
- 
- # If non-zero, try to bypass the file system cache when saving and
- # restoring guests, even though this may give slower operation for
+ # If set to non-zero, shutdown will suspend guests concurrently. Number of
+ # guests on shutdown at any time will not exceed number set in this variable.

-- 
Libvirt Debian packaging