Merge pull request #490 from fbelavenuto/grub-fix

Fixing grub.cfg bug invalid font
fbelavenuto · Jan 11, 2023 · 3f4b033 · 3f4b033
2 parents 56d0da1 + 04fd54c
commit 3f4b033
Show file tree

Hide file tree

Showing 47 changed files with 7 additions and 5 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.0-beta10a
+1.0-beta10b
diff --git a/files/board/arpl/overlayfs/opt/arpl/include/consts.sh b/files/board/arpl/overlayfs/opt/arpl/include/consts.sh
@@ -1,5 +1,5 @@
 
-ARPL_VERSION="1.0-beta11"
+ARPL_VERSION="1.0-beta10b"
 
 # Define paths
 TMP_PATH="/tmp"

diff --git a/files/board/arpl/overlayfs/opt/arpl/menu.sh b/files/board/arpl/overlayfs/opt/arpl/menu.sh
@@ -1025,6 +1025,7 @@ function updateMenu() {
           --infobox "Installing new files" 0 0
         # Process update-list.yml
         while IFS="=" read KEY VALUE; do
+          mkdir -p "`dirname "${VALUE}"`"
           mv /tmp/`basename "${KEY}"` "${VALUE}"
         done < <(readConfigMap "replace" "/tmp/update-list.yml")
         while read F; do

diff --git a/files/board/arpl/p1/ARPL-VERSION b/files/board/arpl/p1/ARPL-VERSION
@@ -1 +1 @@
-1.0-beta11
+1.0-beta10b
diff --git a/files/board/arpl/p1/grub/grub.cfg b/files/board/arpl/p1/grub/grub.cfg
@@ -29,13 +29,13 @@ function load_video {
   fi
 }
 
+load_video
 if loadfont unicode ; then
   set gfxmode=auto
-  load_video
   insmod gfxterm
   #set gfxpayload=800x600
+  terminal_output gfxterm
 fi
-terminal_output gfxterm
 
 #set menu_color_normal=cyan/blue
 #set menu_color_highlight=white/blue

diff --git a/files/board/arpl/p1/grub/locale/ast.mo b/files/board/arpl/p1/grub/locale/ast.mo
diff --git a/files/board/arpl/p1/grub/locale/ca.mo b/files/board/arpl/p1/grub/locale/ca.mo
diff --git a/files/board/arpl/p1/grub/locale/da.mo b/files/board/arpl/p1/grub/locale/da.mo
diff --git a/files/board/arpl/p1/grub/locale/de.mo b/files/board/arpl/p1/grub/locale/de.mo
diff --git a/files/board/arpl/p1/grub/locale/de@hebrew.mo b/files/board/arpl/p1/grub/locale/de@hebrew.mo
diff --git a/files/board/arpl/p1/grub/locale/de_CH.mo b/files/board/arpl/p1/grub/locale/de_CH.mo
diff --git a/files/board/arpl/p1/grub/locale/en@arabic.mo b/files/board/arpl/p1/grub/locale/en@arabic.mo
diff --git a/files/board/arpl/p1/grub/locale/en@cyrillic.mo b/files/board/arpl/p1/grub/locale/en@cyrillic.mo
diff --git a/files/board/arpl/p1/grub/locale/en@greek.mo b/files/board/arpl/p1/grub/locale/en@greek.mo
diff --git a/files/board/arpl/p1/grub/locale/en@hebrew.mo b/files/board/arpl/p1/grub/locale/en@hebrew.mo
diff --git a/files/board/arpl/p1/grub/locale/en@piglatin.mo b/files/board/arpl/p1/grub/locale/en@piglatin.mo
diff --git a/files/board/arpl/p1/grub/locale/en@quot.mo b/files/board/arpl/p1/grub/locale/en@quot.mo
diff --git a/files/board/arpl/p1/grub/locale/eo.mo b/files/board/arpl/p1/grub/locale/eo.mo
diff --git a/files/board/arpl/p1/grub/locale/es.mo b/files/board/arpl/p1/grub/locale/es.mo
diff --git a/files/board/arpl/p1/grub/locale/fi.mo b/files/board/arpl/p1/grub/locale/fi.mo
diff --git a/files/board/arpl/p1/grub/locale/fr.mo b/files/board/arpl/p1/grub/locale/fr.mo
diff --git a/files/board/arpl/p1/grub/locale/gl.mo b/files/board/arpl/p1/grub/locale/gl.mo
diff --git a/files/board/arpl/p1/grub/locale/hr.mo b/files/board/arpl/p1/grub/locale/hr.mo
diff --git a/files/board/arpl/p1/grub/locale/hu.mo b/files/board/arpl/p1/grub/locale/hu.mo
diff --git a/files/board/arpl/p1/grub/locale/id.mo b/files/board/arpl/p1/grub/locale/id.mo
diff --git a/files/board/arpl/p1/grub/locale/it.mo b/files/board/arpl/p1/grub/locale/it.mo
diff --git a/files/board/arpl/p1/grub/locale/ja.mo b/files/board/arpl/p1/grub/locale/ja.mo
diff --git a/files/board/arpl/p1/grub/locale/ko.mo b/files/board/arpl/p1/grub/locale/ko.mo
diff --git a/files/board/arpl/p1/grub/locale/lg.mo b/files/board/arpl/p1/grub/locale/lg.mo
diff --git a/files/board/arpl/p1/grub/locale/lt.mo b/files/board/arpl/p1/grub/locale/lt.mo
diff --git a/files/board/arpl/p1/grub/locale/nb.mo b/files/board/arpl/p1/grub/locale/nb.mo
diff --git a/files/board/arpl/p1/grub/locale/nl.mo b/files/board/arpl/p1/grub/locale/nl.mo
diff --git a/files/board/arpl/p1/grub/locale/pa.mo b/files/board/arpl/p1/grub/locale/pa.mo
diff --git a/files/board/arpl/p1/grub/locale/pl.mo b/files/board/arpl/p1/grub/locale/pl.mo
diff --git a/files/board/arpl/p1/grub/locale/pt.mo b/files/board/arpl/p1/grub/locale/pt.mo
diff --git a/files/board/arpl/p1/grub/locale/pt_BR.mo b/files/board/arpl/p1/grub/locale/pt_BR.mo
diff --git a/files/board/arpl/p1/grub/locale/ro.mo b/files/board/arpl/p1/grub/locale/ro.mo
diff --git a/files/board/arpl/p1/grub/locale/ru.mo b/files/board/arpl/p1/grub/locale/ru.mo
diff --git a/files/board/arpl/p1/grub/locale/sl.mo b/files/board/arpl/p1/grub/locale/sl.mo
diff --git a/files/board/arpl/p1/grub/locale/sr.mo b/files/board/arpl/p1/grub/locale/sr.mo
diff --git a/files/board/arpl/p1/grub/locale/sv.mo b/files/board/arpl/p1/grub/locale/sv.mo
diff --git a/files/board/arpl/p1/grub/locale/tr.mo b/files/board/arpl/p1/grub/locale/tr.mo
diff --git a/files/board/arpl/p1/grub/locale/uk.mo b/files/board/arpl/p1/grub/locale/uk.mo
diff --git a/files/board/arpl/p1/grub/locale/vi.mo b/files/board/arpl/p1/grub/locale/vi.mo
diff --git a/files/board/arpl/p1/grub/locale/zh_CN.mo b/files/board/arpl/p1/grub/locale/zh_CN.mo
diff --git a/files/board/arpl/p1/grub/locale/zh_TW.mo b/files/board/arpl/p1/grub/locale/zh_TW.mo
diff --git a/update-list.yml b/update-list.yml
@@ -4,3 +4,4 @@ replace:
   "files/board/arpl/p1/grub/grub.cfg": "/mnt/p1/grub/grub.cfg"
   "files/board/arpl/p1/ARPL-VERSION" : "/mnt/p1/ARPL-VERSION"
 remove:
+  "/mnt/p1/grub/locales"