[Pkg-xen-changes] [xen] 01/01: Use xen-init-dom0 from initscript when it is available.
Ian James Campbell
ijc at moszumanska.debian.org
Thu Jan 29 13:00:16 UTC 2015
This is an automated email from the git hooks/post-receive script.
ijc pushed a commit to branch feature/xen-init-dom0
in repository xen.
commit ceb0dfb6d2c52239406b47a45c3ac50d3a26d2ba
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.
---
debian/changelog | 7 +++++++
debian/xen-utils-common.xen.init | 18 ++++++++++++++++--
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2540a6b..13fc5b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xen (4.5.0-2) UNRELEASED; urgency=medium
+
+ [ Ian Campbell ]
+ * Use xen-init-dom0 from initscript when it is available.
+
+ -- Ian Campbell <ijc at debian.org> Tue, 27 Jan 2015 09:46:21 +0000
+
xen (4.5.0-1) experimental; urgency=medium
[ Ian Campbell ]
diff --git a/debian/xen-utils-common.xen.init b/debian/xen-utils-common.xen.init
index b903877..f8320e7 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/xen-init-dom0 ] ; then
+ $ROOT/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
More information about the Pkg-xen-changes
mailing list