env_init, grub list & split

live/main.sh

@@ -1,3 +1,4 @@
+env_init
 menu_init
 
 default='scan'

live/menu/cmd.sh

@@ -1,3 +1,4 @@
+env_init
 menu_init
 
 menuentry 'halt' { halt }

live/menu/env.sh

@@ -1,3 +1,4 @@
+env_init
 menu_init "${env} → ${env_mod}"
 
 menuentry 'list file' {

live/menu/gfx.sh

@@ -1,3 +1,4 @@
+env_init
 menu_init
 
 menuentry 'list' {

live/menu/pause.sh

@@ -1,3 +1,4 @@
+env_init
 menu_init
 
 menu_item     0 '                          0'

live/menu/scan.sh

@@ -1,3 +1,4 @@
+env_init
 menu_init "${scan}"
 
 scan "${scan}"

live/menu/set.sh

@@ -1,17 +1,18 @@
+env_init
 menu_init
 
 default='split'
 
-menuentry "cmdpath: ${cmdpath}" { nop }
-menuentry "grub_cpu: ${grub_cpu} → grub_platform: ${grub_platform}" { nop }
-menu_split
-menuentry "check_signatures: ${check_signatures} → pager: ${pager}" { nop }
-menuentry "prefix: ${prefix} → root: ${root}" { nop }
+grub_list_const 'menu'
+grub_split 'menu'
+grub_list_vars 'menu'
+grub_split 'menu'
+grub_list_xtra 'menu'
 menu_split 'split'
-menuentry "esp: ${esp} → data: ${data}" { nop }
-menuentry "env: ${env} → env_mod: ${env_mod}" { nop }
-menuentry "live: ${live}" { nop }
-menu_split
 menu_swap "check_squashfs | ${check_squashfs}" 'check_squashfs' 'enforce' 'no'
 menu_swap "     live_from | ${live_from}" 'live_from' 'ram' 'media'
 menuentry "         pause | ${pause}" { menu 'pause' }
+menu_split
+menuentry "esp: ${esp}" { nop }
+menuentry "env_mod: ${env_mod}" { nop }
+menuentry "pager: ${pager}" { nop }

live/source/menu.sh

@@ -25,7 +25,6 @@ function menu_exit {
 }
 
 function menu_init {
-    env_init
     if [ "${menu}" ] ; then
         if [ "${1}" ] ; then
             menuentry "→ ${menu} → ${1}" { nop }