diff options
| author | Andrew Robbins <contact@andrewrobbins.info> | 2017-08-07 02:22:22 -0400 |
|---|---|---|
| committer | Andrew Robbins <contact@andrewrobbins.info> | 2017-08-08 01:30:07 -0400 |
| commit | f4a7650094961325b989e080d9055ee3a152932b (patch) | |
| tree | f4ad0b4e1d4c617111a341293b5c4acbbad5931d /projects/grub/install/vesafb | |
| parent | 2a8e02404fc7b497c4fe3fe0bb1e7c028cc0d18c (diff) | |
| download | librebootfr-f4a7650094961325b989e080d9055ee3a152932b.tar.gz librebootfr-f4a7650094961325b989e080d9055ee3a152932b.zip | |
Replace hardcoded env variables, add keymap command
The command 'loadfont' was removed because the environment variable
'gfxterm_font' is inspected by GRUB and automatically sets the font to
its value if 'gfxterm' is in the list of active output terminals.
Diffstat (limited to 'projects/grub/install/vesafb')
| -rw-r--r-- | projects/grub/install/vesafb/grub.cfg | 19 | ||||
| -rw-r--r-- | projects/grub/install/vesafb/grubtest.cfg | 19 |
2 files changed, 14 insertions, 24 deletions
diff --git a/projects/grub/install/vesafb/grub.cfg b/projects/grub/install/vesafb/grub.cfg index e057e88b..f61e2684 100644 --- a/projects/grub/install/vesafb/grub.cfg +++ b/projects/grub/install/vesafb/grub.cfg @@ -1,5 +1,3 @@ -set prefix=(memdisk)/boot/grub - insmod nativedisk insmod ehci insmod ohci @@ -17,20 +15,17 @@ terminal_input --append serial terminal_output --append serial terminal_input --append at_keyboard terminal_output --append cbmemc - -gfxpayload=keep terminal_output --append gfxterm -# Prettify GRUB -background_image (cbfsdisk)/background.png -loadfont (cbfsdisk)/dejavusansmono.pf2 +load_env --file (cbfsdisk)/grubenv -# Default to first option, automatically boot after 1 second -set default="0" -set timeout=1 +# User's preferred keyboard layout +if [ -n "${keymap}" ]; then + keymap "${keymap}" +fi -# This is useful when using 'cat' on long files on GRUB terminal -set pager=1 +# Prettify GRUB +background_image "${gfxterm_background}" function try_user_config { set root="${1}" diff --git a/projects/grub/install/vesafb/grubtest.cfg b/projects/grub/install/vesafb/grubtest.cfg index d0e0b46e..50beb915 100644 --- a/projects/grub/install/vesafb/grubtest.cfg +++ b/projects/grub/install/vesafb/grubtest.cfg @@ -1,5 +1,3 @@ -set prefix=(memdisk)/boot/grub - insmod nativedisk insmod ehci insmod ohci @@ -17,20 +15,17 @@ terminal_input --append serial terminal_output --append serial terminal_input --append at_keyboard terminal_output --append cbmemc - -gfxpayload=keep terminal_output --append gfxterm -# Prettify GRUB -background_image (cbfsdisk)/background.png -loadfont (memdisk)/dejavusansmono.pf2 +load_env --file (cbfsdisk)/grubenv -# Default to first option, automatically boot after 1 second -set default="0" -set timeout=1 +# User's preferred keyboard layout +if [ -n "${keymap}" ]; then + keymap "${keymap}" +fi -# This is useful when using 'cat' on long files on GRUB terminal -set pager=1 +# Prettify GRUB +background_image "${gfxterm_background}" function try_user_config { set root="${1}" |