]> xenbits.xensource.com Git - people/iwj/xen.git/commitdiff
xen init script: don't fail when being run in domU
authorHans van Kranenburg <hans@knorrie.org>
Sun, 17 Feb 2019 05:03:46 +0000 (06:03 +0100)
committerIan Jackson <ian.jackson@citrix.com>
Fri, 22 Feb 2019 14:00:16 +0000 (14:00 +0000)
When installing xen-utils-V in a driver domain domU, it drags in
xen-utils-common, which also contains the init script for xenstored and
xenconsoled.

Installing the package will fail right away, because it exits non-zero
after checking whether it's running in a xen dom0 or not:

 systemd[1]: Starting LSB: Xen daemons...
 xen[7215]: Starting Xen daemons: (warning).
 systemd[1]: xen.service: Control process exited, code=exited, status=255/EXCEPTION
 systemd[1]: xen.service: Failed with result 'exit-code'.
 systemd[1]: Failed to start LSB: Xen daemons.
 dpkg: error processing package xen-utils-common (--configure):
  installed xen-utils-common package post-installation script subprocess returned error exit status 1

Since there's nothing to be fixed, there should not be a warning. It's
totally fine to skip xenstored, xenconsoled and qemu steps in this case,
so just exit cleanly.

Link: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=922033
Reported-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Signed-off-by: Hans van Kranenburg <hans@knorrie.org>
Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
debian/xen-utils-common.xen.init

index e16d263def5a48fec7d845f31986367dd7398367..c082e3ad05ddb61a35b90e76f0e13bcd038d95b8 100644 (file)
@@ -280,7 +280,7 @@ case "$1" in
        capability_check
        case "$?" in
                0) ;;
-               *) log_end_msg 255; exit ;;
+               *) log_end_msg 0; exit ;; # not a dom0, skip the rest
        esac
        env_setup
        xenstored_start