diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2015-08-14 14:35:01 (GMT) |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2015-08-14 14:35:01 (GMT) |
| commit | 3676d8c7bea343554e714af9a6ac970dd4331e64 (patch) | |
| tree | 6945dc432582013638d7a087cc149d0d606b9289 | |
| parent | f1ee22538cdee309a7b7afd66dbe783450a54cfa (diff) | |
debian/extra/rules-ubuntu/40-hyperv-hotadd.rules: Also apply to Xen, and rename to 40-vm-hotadd.rules
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/extra/rules-ubuntu/40-hyperv-hotadd.rules | 11 | ||||
| -rw-r--r-- | debian/extra/rules-ubuntu/40-vm-hotadd.rules | 14 |
3 files changed, 16 insertions, 11 deletions
diff --git a/debian/changelog b/debian/changelog index 70f2476..20cfe72 100644 --- 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 diff --git a/debian/extra/rules-ubuntu/40-hyperv-hotadd.rules b/debian/extra/rules-ubuntu/40-hyperv-hotadd.rules deleted file mode 100644 index dd1b2c6..0000000 --- a/debian/extra/rules-ubuntu/40-hyperv-hotadd.rules +++ /dev/null @@ -1,11 +0,0 @@ -# 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" - -# Memory hotadd request -SUBSYSTEM=="memory", ACTION=="add", DEVPATH=="/devices/system/memory/memory[0-9]*", TEST=="state", ATTR{state}="online" - -# CPU hotadd request -SUBSYSTEM=="cpu", ACTION=="add", DEVPATH=="/devices/system/cpu/cpu[0-9]*", TEST=="online", ATTR{online}="1" - -LABEL="hyperv_hotadd_end" diff --git a/debian/extra/rules-ubuntu/40-vm-hotadd.rules b/debian/extra/rules-ubuntu/40-vm-hotadd.rules new file mode 100644 index 0000000..946ca65 --- /dev/null +++ b/debian/extra/rules-ubuntu/40-vm-hotadd.rules @@ -0,0 +1,14 @@ +# 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" + +# CPU hotadd request +SUBSYSTEM=="cpu", ACTION=="add", DEVPATH=="/devices/system/cpu/cpu[0-9]*", TEST=="online", ATTR{online}="1" + +LABEL="vm_hotadd_end" |