2008-02-28 Robert Millan <rmh@aybabtu.com>

* util/update-grub.in: Reorganise terminal validity check.  Accept
        `ieee1275:console' (OLPC) and `*:gfxterm' as valid too.
        Based on suggestion by Franklin PIAT.
This commit is contained in:
robertmh 2008-02-28 10:39:42 +00:00
parent 79ca2d78d4
commit b00ab6967e
2 changed files with 8 additions and 2 deletions

View file

@ -1,3 +1,9 @@
2008-02-28 Robert Millan <rmh@aybabtu.com>
* util/update-grub.in: Reorganise terminal validity check. Accept
`ieee1275:console' (OLPC) and `*:gfxterm' as valid too.
Based on suggestion by Franklin PIAT.
2008-02-28 Fabian Greffrath <greffrath@leat.rub.de> 2008-02-28 Fabian Greffrath <greffrath@leat.rub.de>
* include/grub/util/getroot.h (grub_util_check_block_device): Export new * include/grub/util/getroot.h (grub_util_check_block_device): Export new

View file

@ -124,10 +124,10 @@ fi
# fallback to our default # fallback to our default
case ${platform}:${GRUB_TERMINAL} in case ${platform}:${GRUB_TERMINAL} in
pc:) GRUB_TERMINAL=gfxterm ;; pc:) GRUB_TERMINAL=gfxterm ;;
pc:console | pc:serial) ;;
ieee1275:) GRUB_TERMINAL=ofconsole ;; ieee1275:) GRUB_TERMINAL=ofconsole ;;
ieee1275:ofconsole) ;;
*:) GRUB_TERMINAL=console ;; *:) GRUB_TERMINAL=console ;;
pc:console | pc:serial | ieee1275:ofconsole | ieee1275:console | *:gfxterm)
;;
*:*) echo "Invalid terminal \"${GRUB_TERMINAL}\"" >&2 ; exit 1 ;; *:*) echo "Invalid terminal \"${GRUB_TERMINAL}\"" >&2 ; exit 1 ;;
esac esac