diff options
| author | min li <min.li1@citrix.com> | 2019-05-08 16:31:50 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-08 16:31:50 +0800 |
| commit | ccd1eac68028a003e7bb9f072f8110c12a634ef5 (patch) | |
| tree | 65d88c314980021860288699569ae74eadf6a854 | |
| parent | 07ab55cd688e2430b6b0d754a8421a01d69ac260 (diff) | |
| parent | 77a058f7d2bb49b63274defa23da4410c09a996b (diff) | |
| download | vyos-xe-guest-utilities-ccd1eac68028a003e7bb9f072f8110c12a634ef5.tar.gz vyos-xe-guest-utilities-ccd1eac68028a003e7bb9f072f8110c12a634ef5.zip | |
Merge pull request #61 from cheese/patch-2
Take effect only on Xen virtualization
| -rw-r--r-- | mk/xe-linux-distribution.service | 1 | ||||
| -rw-r--r-- | mk/xen-vcpu-hotplug.rules | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mk/xe-linux-distribution.service b/mk/xe-linux-distribution.service index a1cf4b1..4e60a85 100644 --- a/mk/xe-linux-distribution.service +++ b/mk/xe-linux-distribution.service @@ -1,5 +1,6 @@ [Unit] Description=Linux Guest Agent +ConditionVirtualization=xen [Service] ExecStartPre=/usr/share/oem/xs/xe-linux-distribution /var/cache/xe-linux-distribution diff --git a/mk/xen-vcpu-hotplug.rules b/mk/xen-vcpu-hotplug.rules index ecb200e..a28f895 100644 --- a/mk/xen-vcpu-hotplug.rules +++ b/mk/xen-vcpu-hotplug.rules @@ -1 +1 @@ -ACTION=="add", SUBSYSTEM=="cpu", RUN+="/bin/sh -c '[ ! -e /sys$devpath/online ] || echo 1 > /sys$devpath/online'" +ACTION=="add", SUBSYSTEM=="cpu", RUN+="/bin/sh -c '( ! /usr/bin/xenstore-exists unique-domain-id 2>/dev/null ) || [ ! -e /sys$devpath/online ] || echo 1 > /sys$devpath/online'" |