* util/grub-install.in: Ignore empty devicetree directory.

diff --git a/ChangeLog b/ChangeLog
index 4ca2fac41b226a7792d7b49f1c7543e89fe1afd6..21ed6ff7f01f169f869505b66b6d24cfafcfa1f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-08  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * util/grub-install.in: Ignore empty devicetree directory.
+
 2012-05-08  Bean  <bean123ch@gmail.com>
 
        * 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 0b3829e60c1dcfde807d02575bc30887ada15e57..03d7e1fca444eb6b817d344216b5de5f4e98d523 100644 (file)
--- 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