get in line with live scripts

1 files changed, 8 insertions, 10 deletions

diff --git a/cdroot/boot/grub/grub.cfg b/cdroot/boot/grub/grub.cfg
index af03998..8aab10a 100755
--- a/cdroot/boot/grub/grub.cfg
+++ b/cdroot/boot/grub/grub.cfg
@@ -58,7 +58,7 @@ if [ -f /boot/grub/default-splash.png ]; then
 fi
 
 if [ x$bootlang = x ]; then
-   bootlang=en_US
+   bootlang=en_US.utf8
    export bootlang
 fi
 
@@ -76,16 +76,12 @@ if [ x$acpi_opt = x ]; then
    acpi_opt=''
    export acpi_opt
 fi
+
 if [ x$modeset_opt = x ]; then
    modeset_opt=''
    export modeset_opt
 fi
 
-if [ x$noefi_opt = x ]; then
-   noefi_opt=''
-   export noefi_opt
-fi
-
 insmod part_gpt
 
 menuentry "Start $iso_distro $iso_flavour $iso_version" {
@@ -93,7 +89,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_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} -- 
+   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 vconsole.keymap=${bootkeymap} rd.locale.LANG=${bootlang} ${vesa_opt} ${modeset_opt} ${acpi_opt} -- 
    initrd /boot/initrd
 }
 
@@ -119,7 +115,8 @@ submenu "Language Selection" {
 
    menuentry "English" {
       echo "Switching to: $chosen"
-      set lang=en_US
+#we keep this for later, when grub will learn romanian
+#      set lang=en_US
       set bootlang=en_US.utf8
       export bootlang
       export lang
@@ -128,7 +125,8 @@ submenu "Language Selection" {
 
    menuentry "Română" {
       echo "Switching to: $chosen"
-      set lang=ro_RO
+#we keep this for later, when grub will learn romanian
+#      set lang=ro_RO
       set bootlang=ro_RO.utf8
       export bootlang
       export lang
@@ -148,7 +146,7 @@ submenu "Keyboard Selection" {
 
    menuentry "English UK" {
       echo "Switching to: $chosen"
-      set bootkeymap=gb
+      set bootkeymap=uk
       export bootkeymap
       configfile /boot/grub/grub.cfg
    }