From 6194e19ef9461f495794b239a70396a2bdce4ae5 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 11 Jan 2021 02:35:47 +0000
Subject: restore vconsole && RD.locale.LANG positions, otherwise our language
 and keyboard selection won't work

---
 cdroot/boot/grub/grub.cfg | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/cdroot/boot/grub/grub.cfg b/cdroot/boot/grub/grub.cfg
index 1bd43f5..6ca8945 100755
--- a/cdroot/boot/grub/grub.cfg
+++ b/cdroot/boot/grub/grub.cfg
@@ -1,7 +1,7 @@
 iso_distro=Redcore
 export iso_distro
 
-iso_version=2004
+iso_version=2101
 export iso_version
 
 iso_theme=redcore
@@ -64,7 +64,7 @@ menuentry "Start $iso_distro $iso_version" --class redcore --class gentoo --clas
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /boot/vmlinuz rd.live.image root=CDLABEL=$iso_label rootfstype=auto audit=0 vconsole.keymap=${bootkeymap} rd.locale.LANG=${bootlang}  loglevel=1 console=tty0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 splash quiet ${acpi_opt} --
+   linux /boot/vmlinuz rd.live.image root=CDLABEL=$iso_label rootfstype=auto vconsole.keymap=${bootkeymap} rd.locale.LANG=${bootlang} audit=0 loglevel=1 console=tty0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 splash quiet ${acpi_opt} --
    initrd /boot/initrd
 }
 
@@ -81,7 +81,15 @@ submenu "Advanced Options" {
 
 submenu "Language Selection" {
 
-   menuentry "English" {
+   menuentry "English UK" {
+      echo "Switching to: $chosen"
+      set bootlang=en_GB.utf8
+      export bootlang
+      export lang
+      configfile /boot/grub/grub.cfg
+   }
+
+   menuentry "English US" {
       echo "Switching to: $chosen"
       set bootlang=en_US.utf8
       export bootlang
@@ -89,7 +97,7 @@ submenu "Language Selection" {
       configfile /boot/grub/grub.cfg
    }
 
-   menuentry "Română" {
+   menuentry "Romanian" {
       echo "Switching to: $chosen"
       set bootlang=ro_RO.utf8
       export bootlang
@@ -101,26 +109,25 @@ submenu "Language Selection" {
 
 submenu "Keyboard Selection" {
 
-   menuentry "Romania" {
+   menuentry "English UK" {
       echo "Switching to: $chosen"
-      set bootkeymap=ro
+      set bootkeymap=gb
       export bootkeymap
       configfile /boot/grub/grub.cfg
    }
 
-   menuentry "English UK" {
+   menuentry "English US" {
       echo "Switching to: $chosen"
-      set bootkeymap=gb
+      set bootkeymap=us
       export bootkeymap
       configfile /boot/grub/grub.cfg
    }
 
-   menuentry "USA" {
+   menuentry "Romanian" {
       echo "Switching to: $chosen"
-      set bootkeymap=us
+      set bootkeymap=ro
       export bootkeymap
       configfile /boot/grub/grub.cfg
-   }
+     }
 
 }
-
-- 
cgit v1.2.3