summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDermot Bradley <dermot_bradley@yahoo.com>2022-09-30 18:44:50 +0100
committerNatanael Copa <ncopa@alpinelinux.org>2022-11-11 12:36:20 +0000
commit1ed5992ac80b7878ebbfa10cde3702dfd61b021b (patch)
tree7b8092d43c2666bd5ab7113e6535a1da77e9588f
parentaa018bd7ce3ee8f94821f0a17b2531de43cc47fb (diff)
downloadalpine-conf-1ed5992ac80b7878ebbfa10cde3702dfd61b021b.zip
Add vmd to modules list when nvme is added to it
VMD is Intel's Volume Management Device. Some Intel-based machines have a BIOS/UEFI option to present a NVME SSD via either VMD or as a "native" NVME device. If Alpine is installed on a NVME device when it is presented via VMD then once the Alpine ISO/USB boots the 'vmd' kernel module will be loaded by /etc/init.d/hwdrivers and Alpine will see a /dev/nvme0n1 device to which setup-alpine can install successfully. However, once the newly installed system is then booted from the NVME device the initramfs' init will fail to find the rootfs to mount/boot from as, without the 'vmd' module being loaded, no NVME device will be visible. This MR ensures that the 'vmd' kernel module is added to the cmdline modules list whenever the 'vmd' has been automatically loaded by hwdrivers init.d when booting Alpine prior to running setup-alpine/setup-disk. This MR works together with https://gitlab.alpinelinux.org/alpine/mkinitfs/-/merge_requests/112 (which ensures that 'vmd' present in the initramfs).
-rw-r--r--setup-disk.in6
1 files changed, 5 insertions, 1 deletions
diff --git a/setup-disk.in b/setup-disk.in
index fd0a8d8..34def75 100644
--- a/setup-disk.in
+++ b/setup-disk.in
@@ -639,7 +639,11 @@ install_mounted_root() {
fi
modules="sd-mod,usb-storage,${root_fs}${raidmod}"
case "$initfs_features" in
- *nvme*) modules="$modules,nvme";;
+ *nvme*) modules="$modules,nvme"
+ if [ -e /sys/module/vmd ]; then
+ modules="$modules,vmd"
+ fi
+ ;;
esac
# remove the installed db in case its there so we force re-install