Author: waldi
Date: Sun May 6 17:45:09 2012
New Revision: 1011
Log:
* debian/changelog: Update.
* debian/xen-utils-common.xendomains.default:
Remove not longer supported options.
Modified:
trunk/xen/debian/changelog
trunk/xen/debian/xen-utils-common.xendomains.default
Modified: trunk/xen/debian/changelog
=============================================================================---
trunk/xen/debian/changelog Sun May 6 17:39:50 2012 (r1010)
+++ trunk/xen/debian/changelog Sun May 6 17:45:09 2012 (r1011)
@@ -3,8 +3,9 @@
* Fix generation of architectures for hypervisor packages.
* Remove information about loop devices, it is incorrect. (closes: #503044)
* Create directory for domain images only root readable. (closes: #596048)
- * Add missing sanity check for variable in xendomains init script.
- (closes: #671750)
+ * Update xendomains init script.
+ - Add missing sanity check for save variable. (closes: #671750)
+ - Remove not longer supported config options.
-- Bastian Blank <waldi at debian.org> Sat, 05 May 2012 21:24:18 +0200
Modified: trunk/xen/debian/xen-utils-common.xendomains.default
=============================================================================---
trunk/xen/debian/xen-utils-common.xendomains.default Sun May 6 17:39:50 2012
(r1010)
+++ trunk/xen/debian/xen-utils-common.xendomains.default Sun May 6 17:45:09
2012 (r1011)
@@ -1,39 +1,10 @@
-## Path: System/xen
-## Description: xen domain start/stop on boot
-## Type: string
-## Default:
-#
# The xendomains script can send SysRq requests to domains on shutdown.
# If you don''t want to MIGRATE, SAVE, or SHUTDOWN, this may be a
possibility
# to do a quick and dirty shutdown ("s e i u o") or at least sync the
disks
# of the domains ("s").
#
-XENDOMAINS_SYSRQ=""
-
-## Type: integer
-## Default: 100000
-#
-# If XENDOMAINS_SYSRQ is set, this variable determines how long to wait
-# (in microseconds) after each SysRq, so the domain has a chance to react.
-# If you want to a quick''n''dirty shutdown via SysRq, you may
want to set
-# it to a relatively high value (1200000).
-#
-XENDOMAINS_USLEEP=100000
-
-## Type: integer
-## Default: 5000000
-#
-# When creating a guest domain, it is sensible to allow a little time for it
-# to get started before creating another domain or proceeding through the
-# boot process. Without this, the booting guests will thrash the disk as they
-# start up. This timeout (in microseconds) specifies the delay after guest
-# domain creation.
-#
-XENDOMAINS_CREATE_USLEEP=5000000
+# XENDOMAINS_SYSRQ
-## Type: string
-## Default: ""
-#
# Set this to a non-empty string if you want to migrate virtual machines
# on shutdown. The string will be passed to the xm migrate DOMID command
# as is: It should contain the target IP address of the physical machine
@@ -42,11 +13,8 @@
# If migration succeeds, neither SAVE nor SHUTDOWN will be executed for
# that domain.
#
-XENDOMAINS_MIGRATE=""
+# XENDOMAINS_MIGRATE
-## Type: string
-## Default: /var/lib/xen/save
-#
# Directory to save running domains to when the system (dom0) is
# shut down. Will also be used to restore domains from if # XENDOMAINS_RESTORE
# is set (see below). Leave empty to disable domain saving on shutdown
@@ -55,42 +23,11 @@
#
XENDOMAINS_SAVE=/var/lib/xen/save
-## Type: string
-## Default: "--halt --wait"
-#
-# If neither MIGRATE nor SAVE were enabled or if they failed, you can
-# try to shut down a domain by sending it a shutdown request. To do this,
-# set this to "--halt --wait". Omit the "--wait" flag to
avoid waiting
-# for the domain to be really down. Leave empty to skip domain shutdown.
-#
-XENDOMAINS_SHUTDOWN="--halt --wait"
-
-## Type: string
-## Default: "--all --halt --wait"
-#
-# After we have gone over all virtual machines (resp. all automatically
-# started ones, see XENDOMAINS_AUTO_ONLY below) in a loop and sent SysRq,
-# migrated, saved and/or shutdown according to the settings above, we
-# might want to shutdown the virtual machines that are still running
-# for some reason or another. To do this, set this variable to
-# "--all --halt --wait", it will be passed to xm shutdown.
-# Leave it empty not to do anything special here.
-# (Note: This will hit all virtual machines, even if XENDOMAINS_AUTO_ONLY
-# is set.)
-#
-XENDOMAINS_SHUTDOWN_ALL="--all --halt --wait"
-
-## Type: boolean
-## Default: true
-#
# This variable determines whether saved domains from XENDOMAINS_SAVE
# will be restored on system startup.
#
XENDOMAINS_RESTORE=true
-## Type: string
-## Default: /etc/xen/auto
-#
# This variable sets the directory where domains configurations
# are stored that should be started on system startup automatically.
# Leave empty if you don''t want to start domains automatically
@@ -102,20 +39,6 @@
#
XENDOMAINS_AUTO=/etc/xen/auto
-## Type: boolean
-## Default: false
-#
-# If this variable is set to "true", only the domains started via
config
-# files in XENDOMAINS_AUTO will be treated according to XENDOMAINS_SYSRQ,
-# XENDOMAINS_MIGRATE, XENDOMAINS_SAVE, XENDMAINS_SHUTDOWN; otherwise
-# all running domains will be.
-# Note that the name matching is somewhat fuzzy.
-#
-XENDOMAINS_AUTO_ONLY=false
-
-## Type: integer
-## Default: 300
-#
# On xendomains stop, a number of xm commands (xm migrate, save, shutdown,
# shutdown --all) may be executed. In the worst case, these commands may
# stall forever, which will prevent a successful shutdown of the machine.