From b00ab6967e89f3a59cdc1e76bcb315b7f92bbb46 Mon Sep 17 00:00:00 2001 From: robertmh Date: Thu, 28 Feb 2008 10:39:42 +0000 Subject: [PATCH] 2008-02-28 Robert Millan * util/update-grub.in: Reorganise terminal validity check. Accept `ieee1275:console' (OLPC) and `*:gfxterm' as valid too. Based on suggestion by Franklin PIAT. --- ChangeLog | 6 ++++++ util/update-grub.in | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f0dee54e2..13da46b54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-02-28 Robert Millan + + * 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 * include/grub/util/getroot.h (grub_util_check_block_device): Export new diff --git a/util/update-grub.in b/util/update-grub.in index b4bb6058d..77c19a14d 100644 --- a/util/update-grub.in +++ b/util/update-grub.in @@ -124,10 +124,10 @@ fi # fallback to our default case ${platform}:${GRUB_TERMINAL} in pc:) GRUB_TERMINAL=gfxterm ;; - pc:console | pc:serial) ;; ieee1275:) GRUB_TERMINAL=ofconsole ;; - ieee1275:ofconsole) ;; *:) GRUB_TERMINAL=console ;; + pc:console | pc:serial | ieee1275:ofconsole | ieee1275:console | *:gfxterm) + ;; *:*) echo "Invalid terminal \"${GRUB_TERMINAL}\"" >&2 ; exit 1 ;; esac