[Pkg-xen-devel] [PATCH v2 3/3] xen init script: move init_dom0 into xenstored start

[Hans van Kranenburg]

Executing this is only necessary after starting xenstored. In all other
cases it just prints noop spam to stderr.

    -# /usr/lib/xen-4.11/bin/xen-init-dom0 >/dev/null
    Dom0 is already set up

I don't want to silence stderr, so just move the code into the end of
the xenstored start function.
---
 debian/xen-utils-common.xen.init | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/debian/xen-utils-common.xen.init b/debian/xen-utils-common.xen.init
index f8e4bffc54..159620291a 100644
--- a/debian/xen-utils-common.xen.init
+++ b/debian/xen-utils-common.xen.init
@@ -227,11 +227,8 @@ xenstored_start()
 	if ! [ $time -lt $timeout ] ; then
 	    return 2
 	fi
-}
 
-init_dom0()
-{
-	log_progress_msg "init-dom0"
+	# Add some extra entries about dom0 into xenstore
 	if [ -e $ROOT/bin/xen-init-dom0 ] ; then
 	    $ROOT/bin/xen-init-dom0 > /dev/null
 	else
@@ -265,11 +262,6 @@ case "$1" in
 		0|1) ;;
 		*) log_end_msg 1; exit ;;
 	esac
-	init_dom0
-	case "$?" in
-		0|1) ;;
-		*) log_end_msg 1; exit ;;
-	esac
 	qemu_start
 	case "$?" in
 		0|1) ;;
-- 
2.20.1