mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
Olaf Hering
aa5c183614
ConditionVirtualization= checks if systemd runs in some sort of guest. It is not supposed to detect host capabilities. The current implementation happens to work because systemd-detect-virt from v208 returns also 'xen' in a dom0. In v210 and later 'none' is returned and no service files will be started. Adjust the checks to detect a dom0 vs. native boot. Mounting xenfs depends on /proc/xen, but should only be done for pvops because xenfs exists only there. All other service files should not be started in domU. The file /proc/xen/capabilities exists in both dom0 and domU in a pvops kernel, but only in dom0 it contains 'control_d'. The existing ExecStartPre= check will prevent starting in a domU. ConditionVirtualization=!xen is true in a dom0. But this check is broken in systemd v208, so its not used. Signed-off-by: Olaf Hering <olaf@aepfle.de> Cc: Ian Campbell <ian.campbell@citrix.com> Cc: Ian Jackson <ian.jackson@eu.citrix.com> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Cc: Wei Liu <wei.liu2@citrix.com> Acked-by: Wei Liu <wei.liu2@citrix.com>
16 lines
380 B
Plaintext
16 lines
380 B
Plaintext
[Unit]
|
|
Description=mount xenstore file system
|
|
Requires=proc-xen.mount
|
|
After=proc-xen.mount
|
|
ConditionPathExists=/proc/xen/capabilities
|
|
RefuseManualStop=true
|
|
|
|
[Mount]
|
|
Environment=XENSTORED_MOUNT_CTX=none
|
|
EnvironmentFile=-/etc/sysconfig/xenstored
|
|
EnvironmentFile=-/etc/default/xenstored
|
|
What=xenstore
|
|
Where=@XEN_LIB_STORED@
|
|
Type=tmpfs
|
|
Options=mode=755,context="$XENSTORED_MOUNT_CTX"
|