[Pkg-xen-changes] r1014 - trunk/xen/debian

[Bastian Blank]

Author: waldi
Date: Sun May  6 18:01:00 2012
New Revision: 1014

Log:
* debian/changelog: Update.
* debian/xen-utils-common.xendomains.init: Don't fail if config is missing.

Modified:
   trunk/xen/debian/changelog
   trunk/xen/debian/xen-utils-common.xendomains.init

Modified: trunk/xen/debian/changelog
==============================================================================
--- trunk/xen/debian/changelog	Sun May  6 17:58:11 2012	(r1013)
+++ trunk/xen/debian/changelog	Sun May  6 18:01:00 2012	(r1014)
@@ -6,6 +6,7 @@
     - Create directory for domain images only root readable. (closes: #596048)
     - Add missing sanity checks for variables. (closes: #671750)
     - Remove not longer supported config options.
+    - Don't fail if no config is available.
 
  -- Bastian Blank <waldi at debian.org>  Sat, 05 May 2012 21:24:18 +0200
 

Modified: trunk/xen/debian/xen-utils-common.xendomains.init
==============================================================================
--- trunk/xen/debian/xen-utils-common.xendomains.init	Sun May  6 17:58:11 2012	(r1013)
+++ trunk/xen/debian/xen-utils-common.xendomains.init	Sun May  6 18:01:00 2012	(r1014)
@@ -19,19 +19,11 @@
 	exit 0;
 fi
 
-# Correct exit code would probably be 5, but it's enough 
-# if xend complains if we're not running as privileged domain
 if ! [ -e /proc/xen/privcmd ]; then
 	exit 0
 fi
 
-XENDOM_CONFIG=/etc/default/xendomains
-
-test -r $XENDOM_CONFIG || { echo "$XENDOM_CONFIG not existing";
-	if [ "$1" = "stop" ]; then exit 0;
-	else exit 6; fi; }
-
-. $XENDOM_CONFIG
+[ -r /etc/default/xendomains ] && . /etc/default/xendomains
 
 shopt -s nullglob