Fixing locale, label and remove useless entry

1 files changed, 6 insertions, 10 deletions

diff --git a/cdroot/boot/grub/grub.cfg b/cdroot/boot/grub/grub.cfg
index 0a83419..af03998 100755
--- a/cdroot/boot/grub/grub.cfg
+++ b/cdroot/boot/grub/grub.cfg
@@ -12,6 +12,9 @@ export iso_version
 iso_theme=kogaion
 export iso_theme
 
+iso_label=KOGAION
+export iso_label
+
 # General stuff
 
 set timeout=10
@@ -90,7 +93,7 @@ menuentry "Start $iso_distro $iso_flavour $iso_version" {
    echo "Language: ${bootlang}"
    echo "Keyboard: ${bootkeymap}"
    echo "Please wait..."
-   linux /boot/vmlinuz rd.live.image root=CDLABEL=$iso_distro rootfstype=auto console=tty0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 splash quiet vconsole.keymap=${bootkeymap} locale=${bootlang} ${vesa_opt} ${modeset_opt} ${acpi_opt} -- 
+   linux /boot/vmlinuz rd.live.image root=CDLABEL=$iso_label rootfstype=auto console=tty0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 splash quiet rd.vconsole.keymap=${bootkeymap} rd.locale.LANG=${bootlang} ${vesa_opt} ${modeset_opt} ${acpi_opt} -- 
    initrd /boot/initrd
 }
 
@@ -110,13 +113,6 @@ submenu "Advanced Options" {
       configfile /boot/grub/grub.cfg
    }
 
-   menuentry "Disable EFI" {
-      echo "Disabling EFI..."
-      set noefi_opt="noefi"
-      export noefi_opt
-      configfile /boot/grub/grub.cfg
-   }
-
 }
 
 submenu "Language Selection" {
@@ -124,7 +120,7 @@ submenu "Language Selection" {
    menuentry "English" {
       echo "Switching to: $chosen"
       set lang=en_US
-      set bootlang=en_US
+      set bootlang=en_US.utf8
       export bootlang
       export lang
       configfile /boot/grub/grub.cfg
@@ -133,7 +129,7 @@ submenu "Language Selection" {
    menuentry "Română" {
       echo "Switching to: $chosen"
       set lang=ro_RO
-      set bootlang=ro_RO
+      set bootlang=ro_RO.utf8
       export bootlang
       export lang
       configfile /boot/grub/grub.cfg