Skip to content
Snippets Groups Projects
Commit 697838ff authored by Guido Günther's avatar Guido Günther
Browse files

Update Debianize-libvirt-guests.patch

with new config option PARALLEL_SHUTDOWN
parent deacbc5b
No related branches found
No related tags found
No related merge requests found
...@@ -4,13 +4,14 @@ Subject: Debianize libvirt-guests ...@@ -4,13 +4,14 @@ Subject: Debianize libvirt-guests
Origin: vendor Origin: vendor
--- ---
tools/libvirt-guests.init.sh | 43 +++++++++++++---------------------------- tools/libvirt-guests.init.sh | 41 +++++++++++++----------------------------
tools/libvirt-guests.sysconf | 6 ++-- tools/libvirt-guests.sysconf | 4 ++--
2 files changed, 17 insertions(+), 32 deletions(-) 2 files changed, 15 insertions(+), 30 deletions(-)
diff --git a/tools/libvirt-guests.init.sh b/tools/libvirt-guests.init.sh 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 --- a/tools/libvirt-guests.init.sh
+++ b/tools/libvirt-guests.init.sh +++ b/tools/libvirt-guests.init.sh
@@ -4,8 +4,8 @@ @@ -4,8 +4,8 @@
...@@ -24,7 +25,7 @@ index 367177e..43f35c9 100644 ...@@ -24,7 +25,7 @@ index 367177e..43f35c9 100644
# Default-Start: 2 3 4 5 # Default-Start: 2 3 4 5
# Default-Stop: 0 1 6 # Default-Stop: 0 1 6
# Short-Description: suspend/resume libvirt guests on shutdown/boot # Short-Description: suspend/resume libvirt guests on shutdown/boot
@@ -14,42 +14,28 @@ @@ -14,43 +14,29 @@
# See http://libvirt.org # See http://libvirt.org
### END INIT INFO ### END INIT INFO
...@@ -60,10 +61,10 @@ index 367177e..43f35c9 100644 ...@@ -60,10 +61,10 @@ index 367177e..43f35c9 100644
URIS=default URIS=default
-ON_BOOT=start -ON_BOOT=start
-ON_SHUTDOWN=suspend -ON_SHUTDOWN=suspend
-SHUTDOWN_TIMEOUT=0
+ON_BOOT=ignore +ON_BOOT=ignore
+ON_SHUTDOWN=shutdown +ON_SHUTDOWN=shutdown
+SHUTDOWN_TIMEOUT=30 SHUTDOWN_TIMEOUT=300
PARALLEL_SHUTDOWN=0
START_DELAY=0 START_DELAY=0
BYPASS_CACHE=0 BYPASS_CACHE=0
...@@ -78,7 +79,7 @@ index 367177e..43f35c9 100644 ...@@ -78,7 +79,7 @@ index 367177e..43f35c9 100644
RETVAL=0 RETVAL=0
@@ -316,8 +302,7 @@ gueststatus() { @@ -499,8 +485,7 @@ gueststatus() {
# rh_status # rh_status
# Display current status: whether saved state exists, and whether start # Display current status: whether saved state exists, and whether start
...@@ -89,7 +90,7 @@ index 367177e..43f35c9 100644 ...@@ -89,7 +90,7 @@ index 367177e..43f35c9 100644
if [ -f "$LISTFILE" ]; then if [ -f "$LISTFILE" ]; then
gettext "stopped, with saved guests"; echo gettext "stopped, with saved guests"; echo
diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf 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 --- a/tools/libvirt-guests.sysconf
+++ b/tools/libvirt-guests.sysconf +++ b/tools/libvirt-guests.sysconf
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
...@@ -99,18 +100,14 @@ index 9b8b64f..e0644db 100644 ...@@ -99,18 +100,14 @@ index 9b8b64f..e0644db 100644
-#ON_BOOT=start -#ON_BOOT=start
+#ON_BOOT=ignore +#ON_BOOT=ignore
# number of seconds to wait between each guest start # Number of seconds to wait between each guest start. Set to 0 to allow
#START_DELAY=0 # parallel startup.
@@ -21,10 +21,10 @@ @@ -22,7 +22,7 @@
# which just needs a long time to shutdown. When setting # which just needs a long time to shutdown. When setting
# ON_SHUTDOWN=shutdown, you must also set SHUTDOWN_TIMEOUT to a # ON_SHUTDOWN=shutdown, you must also set SHUTDOWN_TIMEOUT to a
# value suitable for your guests. # value suitable for your guests.
-#ON_SHUTDOWN=suspend -#ON_SHUTDOWN=suspend
+#ON_SHUTDOWN=shutdown +#ON_SHUTDOWN=shutdown
# number of seconds we're willing to wait for a guest to shut down # If set to non-zero, shutdown will suspend guests concurrently. Number of
-#SHUTDOWN_TIMEOUT=0 # guests on shutdown at any time will not exceed number set in this variable.
+#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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment