From 5c61ee27f3c9ad936c5468ff58d929a4cc785875 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Mon, 25 Apr 2016 12:03:32 +0100 Subject: [PATCH] Switch from busybox mdev to kernel devtmpfs This is simpler, and as a by-product should resolve https://github.com/docker/pinata/issues/1968 as it uses the now-more-correct loop device names that newer util-linux expects. Signed-off-by: Justin Cormack --- alpine/Dockerfile | 1 - alpine/kernel/kernel_config | 2 +- alpine/kernel/kernel_config.arm | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 89e997106..f7b302fbb 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -89,7 +89,6 @@ RUN \ rc-update add mount-ro shutdown && \ rc-update add dmesg sysinit && \ rc-update add devfs sysinit && \ - rc-update add mdev sysinit && \ rc-update add hwdrivers sysinit && \ rc-update add sysfs && \ rc-update add fsck && \ diff --git a/alpine/kernel/kernel_config b/alpine/kernel/kernel_config index 31cc8e4cd..3b4598efd 100644 --- a/alpine/kernel/kernel_config +++ b/alpine/kernel/kernel_config @@ -1249,7 +1249,7 @@ CONFIG_HAVE_BPF_JIT=y # CONFIG_UEVENT_HELPER=y CONFIG_UEVENT_HELPER_PATH="" -# CONFIG_DEVTMPFS is not set +CONFIG_DEVTMPFS=y CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y diff --git a/alpine/kernel/kernel_config.arm b/alpine/kernel/kernel_config.arm index ee472b171..aab556a91 100644 --- a/alpine/kernel/kernel_config.arm +++ b/alpine/kernel/kernel_config.arm @@ -1236,7 +1236,7 @@ CONFIG_ARM_AMBA=y # CONFIG_UEVENT_HELPER=y CONFIG_UEVENT_HELPER_PATH="" -# CONFIG_DEVTMPFS is not set +CONFIG_DEVTMPFS=y CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y CONFIG_FW_LOADER=y