From df760f778a304c0fb240ab087e182557c480d162 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Tue, 8 May 2012 23:11:47 +0200 Subject: [PATCH] * util/grub-install.in: Ignore empty devicetree directory. --- ChangeLog | 4 ++++ util/grub-install.in | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4ca2fac41..21ed6ff7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-05-08 Vladimir Serbinenko + + * util/grub-install.in: Ignore empty devicetree directory. + 2012-05-08 Bean * grub-core/net/ip.c (reassemble): Make asm_buffer into asm_netbuff. diff --git a/util/grub-install.in b/util/grub-install.in index 0b3829e60..03d7e1fca 100644 --- a/util/grub-install.in +++ b/util/grub-install.in @@ -311,7 +311,12 @@ if [ x$source_dir = x ]; then if [ -d /sys/firmware/efi ]; then target="i386-efi" elif [ -e /proc/device-tree ]; then - target="i386-ieee1275" + target=i386-pc + for x in /proc/device-tree/*; do + if [ -e "$x" ]; then + target="i386-ieee1275" + fi + done else target=i386-pc fi