From: Michael Prokop <mika@grml.org>
Date: Sat, 29 Dec 2018 16:13:55 +0000 (+0100)
Subject: grml-cheatcodes + isolinux splashes: drop xkeyboard + lang=*-iso boot options
X-Git-Tag: v0.33.5~1
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=6eb8f42286b79c62e848fc8bdaaee5f01a93d7e3;hp=20f57e188b345394483b76f080154bb2a878b10d

grml-cheatcodes + isolinux splashes: drop xkeyboard + lang=*-iso boot options

The xkeyboard boot option is no longer supported as such (see
relevant changes in grml-live commit 3a054970e and grml-autoconfig
commit fc67c1849a4), so longer announce it.

The lang=*-iso is supposed to disappear and no longer supported as
such, so don't announce it either.
---

diff --git a/templates/GRML/grml-cheatcodes.txt b/templates/GRML/grml-cheatcodes.txt
index b46edcd..dff83a9 100644
--- a/templates/GRML/grml-cheatcodes.txt
+++ b/templates/GRML/grml-cheatcodes.txt
@@ -38,11 +38,10 @@ Regional settings:
 ------------------
 grml lang=at|de|cn|da|es|fr|it      Specify language ($LANG, $LC_ALL, $LANGUAGE - utf8) + keyboard
 grml lang=nl|pl|ru|sk|tr|tw|us      Specify language ($LANG, $LC_ALL, $LANGUAGE - utf8) + keyboard
-grml lang=$LANG-iso                 Activate $LANG (use like in lines above) with iso-mode instead of utf8
 grml utc                            Hardware Clock is set to Coordinated Universal Time (UTC)
 grml localtime                      Hardware Clock is set to local time (LOCAL), this is the default
 grml tz=Europe/Vienna               Use specified timezone for TZ, defaults to TZ=UTC
-grml keyboard=us xkeyboard=us       Use different keyboard layout (text-console/X)
+grml keyboard=us                    Use different keyboard layout
 
 Configuration settings:
 -----------------------
diff --git a/templates/boot/isolinux/f4 b/templates/boot/isolinux/f4
index cdfb3fe..032f6b6 100644
--- a/templates/boot/isolinux/f4
+++ b/templates/boot/isolinux/f4
@@ -11,13 +11,13 @@
                 copy /etc/network then to local system and restart networking  
  grml gmt tz=Europe/Vienna   use GMT-based time and specified timezone for TZ  
  grml home=/dev/sda1                   use specified device as home directory  
- grml keyboard=de xkeyboard=de                                   set keyboard  
- grml lang=[at|ch|da|de|es|fr|it|...|us]       set keyboard + language (UTF8)  
- grml lang=[at|ch|da|de|es|fr|it|...|us]-iso   set keyboard + language  (ISO)  
+ grml keyboard=de                                                set keyboard  
+ grml lang=[at|ch|da|de|es|fr|it|...|us]              set keyboard + language  
  grml myconfig=/dev/fd0              load configuration from specified device  
  grml noautoconfig               disable searching for device labeled GRMLCFG  
  grml nodhcp                     disable searching for network setup via DHCP  
  grml noeject noprompt      do not eject CD after halt / do not prompt for it  
  grml nofstab / nolabel   disable generating of /etc/fstab / use of fs-labels  
                                                                                
+                                                                               
 1f