From 14642e6ec49a025fe83a5c7a2fc69bdb2efe5c9d Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Sun, 22 Jan 2023 21:43:04 +0100
Subject: Support Console OS boot menu in all Slackware Live variants

---
 liveinit.tpl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'liveinit.tpl')

diff --git a/liveinit.tpl b/liveinit.tpl
index 32c7986..41fda41 100644
--- a/liveinit.tpl
+++ b/liveinit.tpl
@@ -646,7 +646,12 @@ if [ "$RESCUE" = "" ]; then
     SUBSYS="$1"
 
     # Find all supported modules:
-    for MODULE in $(find_mod /mnt/media/${LIVEMAIN}/${SUBSYS}/) $(find_mod ${SUPERMNT}/${LIVESLAKROOT}/${LIVEMAIN}/${SUBSYS}/) ; do
+    SUBSYSSET="$(find_mod /mnt/media/${LIVEMAIN}/${SUBSYS}/) $(find_mod ${SUPERMNT}/${LIVESLAKROOT}/${LIVEMAIN}/${SUBSYS}/)"
+    if [ "$SUBSYS" = "optional" ]; then
+      # We need to load any core2ram modules first:
+      SUBSYSSET="$(find_mod /mnt/media/${LIVEMAIN}/core2ram/) $(find_mod ${SUPERMNT}/${LIVESLAKROOT}/${LIVEMAIN}/core2ram/ ${SUBSYSSET})"
+    fi
+    for MODULE in ${SUBSYSSET} ; do
       # Strip path and extension from the modulename:
       MODBASE="$(mod_base ${MODULE})"
       if [ "$SUBSYS" = "optional" ]; then
-- 
cgit v1.2.3