From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sat, 13 Dec 2014 10:44:26 +0000 (+0100)
Subject: - SysVinit scripts fixes from
X-Git-Tag: auto/th/xen-4.4.1-3
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=1967bdde3b73092bc3e4b19e5be15d5e47cfc740;p=packages%2Fxen.git

- SysVinit scripts fixes from
  http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2014-December/024147.html
- rel 3
---

diff --git a/xen.spec b/xen.spec
index d5a0248..1f9989a 100644
--- a/xen.spec
+++ b/xen.spec
@@ -42,7 +42,7 @@ Summary:	Xen - a virtual machine monitor
 Summary(pl.UTF-8):	Xen - monitor maszyny wirtualnej
 Name:		xen
 Version:	4.4.1
-Release:	2
+Release:	3
 License:	GPL v2, interface parts on BSD-like
 Group:		Applications/System
 Source0:	http://bits.xensource.com/oss-xen/release/%{version}/%{name}-%{version}.tar.gz
diff --git a/xendomains.init b/xendomains.init
index 7981b2f..d4cdf40 100755
--- a/xendomains.init
+++ b/xendomains.init
@@ -31,7 +31,7 @@ shopt -s nullglob
 
 check_config_name()
 {
-	/usr/lib/xen/bin/xen-toolstack create --quiet --dryrun --defconfig "$1" | sed -n 's/^.*\("name":"\([^"]*\)",.*\)\|(name \(.*\))$/\2\3/p'
+	/usr/lib/xen/bin/xen-toolstack create --quiet --dryrun --defconfig "$1" | sed -n 's/^.*(name \(.*\))$/\1/p;s/^.*"name": "\(.*\)",$/\1/p'
 }
 
 check_running()
diff --git a/xenstored.init b/xenstored.init
index 2784da3..464272c 100644
--- a/xenstored.init
+++ b/xenstored.init
@@ -51,6 +51,7 @@ start () {
 	show "Setting domain 0 name"
 	busy
 	xenstore-write "/local/domain/0/name" "Domain-0"
+	xenstore-write "/local/domain/0/domid" "0"
 	ok
 	touch /var/lock/subsys/xenstored
 }