iso-image: unqualified root → ($root)
This technically changes nothing. In practice `$root` is always the "CWD", whether searched for automatically or not. But this serves to announce we are relying on `$root`... I guess...
This commit is contained in:
parent
15eaed0718
commit
c9bb054dd6
|
@ -201,7 +201,7 @@ let
|
||||||
|
|
||||||
# Fonts can be loaded?
|
# Fonts can be loaded?
|
||||||
# (This font is assumed to always be provided as a fallback by NixOS)
|
# (This font is assumed to always be provided as a fallback by NixOS)
|
||||||
if loadfont /EFI/boot/unicode.pf2; then
|
if loadfont (\$root)/EFI/boot/unicode.pf2; then
|
||||||
set with_fonts=true
|
set with_fonts=true
|
||||||
fi
|
fi
|
||||||
if [ "\$textmode" != "true" -a "\$with_fonts" == "true" ]; then
|
if [ "\$textmode" != "true" -a "\$with_fonts" == "true" ]; then
|
||||||
|
@ -225,11 +225,11 @@ let
|
||||||
${ # When there is a theme configured, use it, otherwise use the background image.
|
${ # When there is a theme configured, use it, otherwise use the background image.
|
||||||
if config.isoImage.grubTheme != null then ''
|
if config.isoImage.grubTheme != null then ''
|
||||||
# Sets theme.
|
# Sets theme.
|
||||||
set theme=/EFI/boot/grub-theme/theme.txt
|
set theme=(\$root)/EFI/boot/grub-theme/theme.txt
|
||||||
# Load theme fonts
|
# Load theme fonts
|
||||||
$(find ${config.isoImage.grubTheme} -iname '*.pf2' -printf "loadfont /EFI/boot/grub-theme/%P\n")
|
$(find ${config.isoImage.grubTheme} -iname '*.pf2' -printf "loadfont (\$root)/EFI/boot/grub-theme/%P\n")
|
||||||
'' else ''
|
'' else ''
|
||||||
if background_image /EFI/boot/efi-background.png; then
|
if background_image (\$root)/EFI/boot/efi-background.png; then
|
||||||
# Black background means transparent background when there
|
# Black background means transparent background when there
|
||||||
# is a background image set... This seems undocumented :(
|
# is a background image set... This seems undocumented :(
|
||||||
set color_normal=black/black
|
set color_normal=black/black
|
||||||
|
@ -307,12 +307,12 @@ let
|
||||||
${grubMenuCfg}
|
${grubMenuCfg}
|
||||||
|
|
||||||
hiddenentry 'Text mode' --hotkey 't' {
|
hiddenentry 'Text mode' --hotkey 't' {
|
||||||
loadfont /EFI/boot/unicode.pf2
|
loadfont (\$root)/EFI/boot/unicode.pf2
|
||||||
set textmode=true
|
set textmode=true
|
||||||
terminal_output gfxterm console
|
terminal_output gfxterm console
|
||||||
}
|
}
|
||||||
hiddenentry 'GUI mode' --hotkey 'g' {
|
hiddenentry 'GUI mode' --hotkey 'g' {
|
||||||
$(find ${config.isoImage.grubTheme} -iname '*.pf2' -printf "loadfont /EFI/boot/grub-theme/%P\n")
|
$(find ${config.isoImage.grubTheme} -iname '*.pf2' -printf "loadfont (\$root)/EFI/boot/grub-theme/%P\n")
|
||||||
set textmode=false
|
set textmode=false
|
||||||
terminal_output gfxterm
|
terminal_output gfxterm
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue