mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
build: use correct qemu path in systemd service file and init script
When --with-system-qemu is used, it is possible that we cannot find qemu-system-i386 in LIBEXEC_BIN, which can cause error in xencommons init script and xen-qemu-dom0-disk-backend.service systemd service. Signed-off-by: Ting-Wei Lan <lantw44@gmail.com> Acked-by: Ian Campbell <ian.campbell@citrix.com>
This commit is contained in:
Ting-Wei Lan authored and 
Ian Campbell committed
1 parent
211ce257be
commit
62fe12e12e
6 files changed
+33
-17
No files matched your search
@@ -47,4 +47,4 @@ XENSTORED_ARGS=
|
||||
#XENBACKENDD_DEBUG=[yes|on|1]
|
||||
|
||||
# qemu path
|
||||
#QEMU_XEN=@LIBEXEC_BIN@/qemu-system-i386
|
||||
#QEMU_XEN=@qemu_xen_path@
|
||||
@@ -98,7 +98,7 @@ do_start () {
|
||||
test -z "$XENCONSOLED_TRACE" || XENCONSOLED_ARGS=" --log=$XENCONSOLED_TRACE"
|
||||
${sbindir}/xenconsoled --pid-file=$XENCONSOLED_PIDFILE $XENCONSOLED_ARGS
|
||||
echo Starting QEMU as disk backend for dom0
|
||||
test -z "$QEMU_XEN" && QEMU_XEN="${LIBEXEC_BIN}/qemu-system-i386"
|
||||
test -z "$QEMU_XEN" && QEMU_XEN="@qemu_xen_path@"
|
||||
$QEMU_XEN -xen-domid 0 -xen-attach -name dom0 -nographic -M xenpv -daemonize \
|
||||
-monitor /dev/null -serial /dev/null -parallel /dev/null \
|
||||
-pidfile $QEMU_PIDFILE
|
||||
|
||||
@@ -11,7 +11,7 @@ Type=simple
|
||||
PIDFile=@XEN_RUN_DIR@/qemu-dom0.pid
|
||||
ExecStartPre=/bin/grep -q control_d /proc/xen/capabilities
|
||||
ExecStartPre=/bin/mkdir -p @XEN_RUN_DIR@
|
||||
ExecStart=@LIBEXEC_BIN@/qemu-system-i386 -xen-domid 0 \
|
||||
ExecStart=@qemu_xen_systemd@ -xen-domid 0 \
|
||||
-xen-attach -name dom0 -nographic -M xenpv -daemonize \
|
||||
-monitor /dev/null -serial /dev/null -parallel /dev/null \
|
||||
-pidfile @XEN_RUN_DIR@/qemu-dom0.pid
|
||||
|
||||