[Pkg-xen-changes] [xen] 04/08: Use xen-init-dom0 from initscript when it is available.

[Bastian Blank]

This is an automated email from the git hooks/post-receive script.

waldi pushed a commit to branch debian/jessie
in repository xen.

commit 3f837d0aebd0373bbf15dfa2b174ce7f87f35612
Author: Ian Campbell <ijc at debian.org>
Date:   Thu Jan 29 12:59:45 2015 +0000

    Use xen-init-dom0 from initscript when it is available.
    
    (cherry picked from commit 2861252751ec93dc54e47a8ff56054e8c59d5bc9)
    
    Conflicts:
    	debian/changelog
---
 debian/changelog                 |  4 ++++
 debian/xen-utils-common.xen.init | 18 ++++++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 33cbb98..9abf002 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
 xen (4.4.1-7) UNRELEASED; urgency=medium
 
+  [ Bastian Blank ]
   * Fix use after free on guest shutdown.
     CVE-2015-0361
   * Fix rate limits of guest triggered locking.
     CVE-2015-1563
 
+  [ Ian Campbell ]
+  * Use xen-init-dom0 from initscript when it is available.
+
  -- Bastian Blank <waldi at debian.org>  Sat, 28 Feb 2015 23:06:03 +0100
 
 xen (4.4.1-6) unstable; urgency=medium
diff --git a/debian/xen-utils-common.xen.init b/debian/xen-utils-common.xen.init
index b903877..a7dc6fd 100644
--- a/debian/xen-utils-common.xen.init
+++ b/debian/xen-utils-common.xen.init
@@ -193,8 +193,17 @@ xenstored_start()
 	start-stop-daemon --start --quiet --pidfile "$XENSTORED_PIDFILE" --exec "$XENSTORED" -- \
 		$XENSTORED_ARGS --pid-file="$XENSTORED_PIDFILE" \
 		|| return 2
-	xenstore-write "/local/domain/0/name" "Domain-0"
-	xenstore-write "/local/domain/0/domid" "0"
+}
+
+init_dom0()
+{
+	log_progress_msg "init-dom0"
+	if [ -e $ROOT/bin/xen-init-dom0 ] ; then
+	    $ROOT/bin/xen-init-dom0
+	else
+	    xenstore-write "/local/domain/0/name" "Domain-0"
+	    xenstore-write "/local/domain/0/domid" "0"
+	fi
 }
 
 case "$1" in
@@ -227,6 +236,11 @@ case "$1" in
 		0|1) ;;
 		*) log_end_msg 1; exit ;;
 	esac
+	init_dom0
+	case "$?" in
+		0|1) ;;
+		*) log_end_msg 1; exit ;;
+	esac
 	log_end_msg 0
 	;;
   stop)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-xen/xen.git