normal

build.sh

@@ -57,26 +57,13 @@ rm --force --recursive \
 mkdir --parents "${MEMDISK_DIRECTORY}"
 
 echo -n "\
-function var_search {
-    search \\
-    --set data \\
+function set_init {
+    search --no-floppy --set data \\
     --fs-uuid '${DATA}'
     #
-    search \\
-    --set esp \\
+    search --no-floppy --set esp \\
     --fs-uuid '${ESP}'
-}
-
-function var_set {
-    check_signatures='no'
-    pager=1
-    #
-    var_search
     if [ \"\${esp}\" ] ; then
-        #
-        prefix=\"(\${esp})/grub\"
-        root=\"\${esp}\"
-        #
         env=\"(\${esp})/grub.env\"
         live=\"(\${esp})/${PROJECT}/live\"
         #
@@ -84,13 +71,23 @@ function var_set {
             source \"\${file}\"
         done
         unset file
-        #
-        env_init
-        normal \"\${live}/main.sh\"
     fi
 }
 
-var_set
+function normal_init {
+    check_signatures='no'
+    pager=1
+    #
+    set_init
+    if [ \"\${esp}\" ] ; then
+        prefix=\"(\${esp})/grub\"
+        root=\"\${esp}\"
+        #
+        normal \"\${live}/normal.sh\"
+    fi
+}
+
+normal_init
 " > "${MEMDISK_FILE}"
 # gpg --detach-sign "${MEMDISK_FILE}"