[Merge] ~dbungert/ubuntu/+source/initramfs-tools:pmem into ~ubuntu-core-dev/ubuntu/+source/initramfs-tools:ubuntu/devel

[Dan Bungert]

Diff comments:

> diff --git a/hook-functions b/hook-functions
> index 8253625..33e03e6 100644
> --- a/hook-functions
> +++ b/hook-functions
> @@ -725,6 +725,7 @@ auto_add_modules()
>  			manual_add_modules -s "${blockfuncs}" "=drivers/block" \
>  				"=drivers/nvme" "=drivers/dax" vmd
>  			manual_add_modules -s nvdimm_bus_register "=drivers/nvdimm" "=drivers/acpi"
> +			modules="$modules dax_pmem nd_pmem"

Thanks for the review.

I have created logs of the modules present in the initrd under 3 cases:
baseline: https://paste.ubuntu.com/p/5mgRW7z6t8/
dax_pmem, no nd_pmem: https://paste.ubuntu.com/p/8tTsdND4bQ/
dax_pmem and nd_pmem: https://paste.ubuntu.com/p/fcR6yZMFZv/

Diffing those logs shows that adding nd_pmem, while it looks redundant, does indeed produce a different result and adds the nd_pmem and nd_btt modules.

>  		;;
>  		ubi)
>  			modules="$modules deflate zlib lzo ubi ubifs"


-- 
https://code.launchpad.net/~dbungert/ubuntu/+source/initramfs-tools/+git/initramfs-tools/+merge/461853
Your team Ubuntu Core Development Team is subscribed to branch ~ubuntu-core-dev/ubuntu/+source/initramfs-tools:ubuntu/devel.