From 1c3e40ea2b6edd7c8deabc8fa70074b5059b3fde Mon Sep 17 00:00:00 2001 From: Sylvain Prat Date: Thu, 9 Dec 2021 09:21:39 +0100 Subject: [PATCH 1/2] Fixes #3738: add missing devices to acpid According to busybox' acpid code, acpid should be allowed to access /dev/input/event*, so we all all "input" devices (whose major number is 13) Signed-off-by: Sylvain Prat --- pkg/acpid/build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/acpid/build.yml b/pkg/acpid/build.yml index 41bb44319..30caff530 100644 --- a/pkg/acpid/build.yml +++ b/pkg/acpid/build.yml @@ -1,5 +1,9 @@ image: acpid config: binds: - - /dev:/dev + - /dev:/dev + devices: + - path: all + type: c + major: 13 pid: host From 4bbb32e68c6fdc81c1bbc953252bce1d79f88342 Mon Sep 17 00:00:00 2001 From: Sylvain Prat Date: Thu, 9 Dec 2021 09:22:30 +0100 Subject: [PATCH 2/2] Update acpid hash Signed-off-by: Sylvain Prat --- examples/docker-for-mac.yml | 2 +- test/cases/010_platforms/010_hyperkit/010_acpi/test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index a08827358..88477110e 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -49,7 +49,7 @@ onboot: services: # Enable acpi to shutdown on power events - name: acpid - image: linuxkit/acpid:e9a94e593d6be2fc1b3eb6d566f23ac9ca9807fd + image: linuxkit/acpid:c05a368754f6436b326945dc16135ba547568d8d # Enable getty for easier debugging - name: getty image: linuxkit/getty:3c6e89681a988c3d4e2610fcd7aaaa0247ded3ec diff --git a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml index 7cfeb1593..f0c6eb102 100644 --- a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml +++ b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml @@ -7,4 +7,4 @@ init: - linuxkit/containerd:2f0907913dd54ab5186006034eb224a0da12443e services: - name: acpid - image: linuxkit/acpid:e9a94e593d6be2fc1b3eb6d566f23ac9ca9807fd + image: linuxkit/acpid:c05a368754f6436b326945dc16135ba547568d8d