lib/vfscore: Support embedded initrd with custom compiled-in fstabs

This commit enables compiling images with embedded initrds with "custom"
compiled-in mount tables (fstabs). As soon as one of the activated
compiled-in mount table references to the device `"embedded"`, the
configuration requires a path for an initrd for embedding at compile
time. Prio this change, an initrd could only be embedded via using
pre-configured (and non-"custom") table configuration that depends on
an embedded initrd, for example: "Embedded InitRD (CPIO)".

Signed-off-by: Simon Kuenzer <simon@unikraft.io>
Approved-by: Razvan Deaconescu <razvand@unikraft.io>
Reviewed-by: Razvan Deaconescu <razvand@unikraft.io>
GitHub-Closes: #1540

diff --git a/lib/vfscore/Config.uk b/lib/vfscore/Config.uk
index a206267b2b3855569302ed81bd4c9a8d28997e48..b721f7e63be19ce1ed3168d94f20a6e9d6c28ca7 100644 (file)
--- a/lib/vfscore/Config.uk
+++ b/lib/vfscore/Config.uk
@@ -776,7 +776,16 @@ default y if LIBVFSCORE_AUTOMOUNT_CI || LIBVFSCORE_AUTOMOUNT_UP
 config LIBVFSCORE_AUTOMOUNT_EINITRD
 bool
 default y if LIBVFSCORE_AUTOMOUNT_CI && LIBVFSCORE_AUTOMOUNT_CI_EINITRD
-default y if LIBVFSCORE_AUTOMOUNT_UP && LIBVFSCORE_AUTOMOUNT_FB && (LIBVFSCORE_AUTOMOUNT_FB_EINITRD || LIBVFSCORE_AUTOMOUNT_FB_EINITRD_EXTRACT)
+default y if LIBVFSCORE_AUTOMOUNT_CI && LIBVFSCORE_AUTOMOUNT_CI_CUSTOM && LIBVFSCORE_AUTOMOUNT_CI0 && (LIBVFSCORE_AUTOMOUNT_CI0_DEV = "embedded")
+default y if LIBVFSCORE_AUTOMOUNT_CI && LIBVFSCORE_AUTOMOUNT_CI_CUSTOM && LIBVFSCORE_AUTOMOUNT_CI1 && (LIBVFSCORE_AUTOMOUNT_CI1_DEV = "embedded")
+default y if LIBVFSCORE_AUTOMOUNT_CI && LIBVFSCORE_AUTOMOUNT_CI_CUSTOM && LIBVFSCORE_AUTOMOUNT_CI2 && (LIBVFSCORE_AUTOMOUNT_CI2_DEV = "embedded")
+default y if LIBVFSCORE_AUTOMOUNT_CI && LIBVFSCORE_AUTOMOUNT_CI_CUSTOM && LIBVFSCORE_AUTOMOUNT_CI3 && (LIBVFSCORE_AUTOMOUNT_CI3_DEV = "embedded")
+default y if LIBVFSCORE_AUTOMOUNT_UP && LIBVFSCORE_AUTOMOUNT_FB && LIBVFSCORE_AUTOMOUNT_FB_EINITRD
+default y if LIBVFSCORE_AUTOMOUNT_UP && LIBVFSCORE_AUTOMOUNT_FB && LIBVFSCORE_AUTOMOUNT_FB_EINITRD_EXTRACT
+default y if LIBVFSCORE_AUTOMOUNT_UP && LIBVFSCORE_AUTOMOUNT_FB && LIBVFSCORE_AUTOMOUNT_FB_CUSTOM && LIBVFSCORE_AUTOMOUNT_FB0 && (LIBVFSCORE_AUTOMOUNT_FB0_DEV = "embedded")
+default y if LIBVFSCORE_AUTOMOUNT_UP && LIBVFSCORE_AUTOMOUNT_FB && LIBVFSCORE_AUTOMOUNT_FB_CUSTOM && LIBVFSCORE_AUTOMOUNT_FB1 && (LIBVFSCORE_AUTOMOUNT_FB1_DEV = "embedded")
+default y if LIBVFSCORE_AUTOMOUNT_UP && LIBVFSCORE_AUTOMOUNT_FB && LIBVFSCORE_AUTOMOUNT_FB_CUSTOM && LIBVFSCORE_AUTOMOUNT_FB2 && (LIBVFSCORE_AUTOMOUNT_FB2_DEV = "embedded")
+default y if LIBVFSCORE_AUTOMOUNT_UP && LIBVFSCORE_AUTOMOUNT_FB && LIBVFSCORE_AUTOMOUNT_FB_CUSTOM && LIBVFSCORE_AUTOMOUNT_FB3 && (LIBVFSCORE_AUTOMOUNT_FB3_DEV = "embedded")
 
 if LIBVFSCORE_AUTOMOUNT_EINITRD
        config LIBVFSCORE_AUTOMOUNT_EINITRD_PATH