- 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 d5a0248b7ad11f23ddd43dd670b7dfa25d789f97..1f9989ac78d4c044756080294913657ef5f508de 100644 (file)
--- 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 7981b2f51f3fa1a936b8fad9a93c3e604e108f47..d4cdf406f3433f0e1e5829b9b32282d6a3ad1d8b 100755 (executable)
--- 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 2784da33fb61ac29824c471aac28345599ff52f3..464272cba9ba9421de564653e658114301e3ea1f 100644 (file)
--- 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
 }