debian/extra/rules-ubuntu/40-hyperv-hotadd.rules: Also apply to Xen, and...

debian/extra/rules-ubuntu/40-hyperv-hotadd.rules: Also apply to Xen, and rename to 40-vm-hotadd.rules

debian/extra/rules-ubuntu/40-hyperv-hotadd.rules: Also apply to Xen, and...
3676d8c7 · Martin Pitt · f1ee2253 · 3676d8c7 · 3676d8c7
Commit 3676d8c7 authored 9 years ago by Martin Pitt
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ systemd (224-2) UNRELEASED; urgency=medium
  * Fix broken ACL in tmpfiles.d/systemd.conf. (Closes: #794645, LP: #1480552)
  * Add debian/tests/unit-config: Test "systemctl link"; reproduces LP#1480310.
  * Add a hack to unbreak "systemctl link". (LP: #1480310)
+  * debian/extra/rules-ubuntu/40-hyperv-hotadd.rules: Also apply to Xen, and
+    rename to 40-vm-hotadd.rules.

 -- Martin Pitt <mpitt@debian.org>  Tue, 04 Aug 2015 15:20:19 +0200


--- a/debian/extra/rules-ubuntu/40-hyperv-hotadd.rules
+++ b/debian/extra/rules-ubuntu/40-hyperv-hotadd.rules
-# On Hyper-V Virtual Machines we want to add memory and cpus as soon as they appear
-ATTR{[dmi/id]sys_vendor}!="Microsoft Corporation", GOTO="hyperv_hotadd_end"
-ATTR{[dmi/id]product_name}!="Virtual Machine", GOTO="hyperv_hotadd_end"
+# On Hyper-V and Xen Virtual Machines we want to add memory and cpus as soon as they appear
+ATTR{[dmi/id]sys_vendor}=="Microsoft Corporation", ATTR{[dmi/id]product_name}=="Virtual Machine", GOTO="vm_hotadd_apply"
+ATTR{[dmi/id]sys_vendor}=="Xen", Machine", GOTO="vm_hotadd_apply"
+GOTO="vm_hotadd_end"
+
+LABEL="vm_hotadd_apply"

 # Memory hotadd request
 SUBSYSTEM=="memory", ACTION=="add", DEVPATH=="/devices/system/memory/memory[0-9]*", TEST=="state", ATTR{state}="online"
@@ -8,4 +11,4 @@ SUBSYSTEM=="memory", ACTION=="add", DEVPATH=="/devices/system/memory/memory[0-9]
 # CPU hotadd request
 SUBSYSTEM=="cpu", ACTION=="add", DEVPATH=="/devices/system/cpu/cpu[0-9]*", TEST=="online", ATTR{online}="1"

-LABEL="hyperv_hotadd_end"
+LABEL="vm_hotadd_end"