2005-11-22 Hollis Blanchard <hollis@penguinppc.org>

	* util/powerpc/ieee1275/grub-install.in: Run the mount point
	check before installing files.

diff --git a/ChangeLog b/ChangeLog
index 1918abf651f82b69cbb7d339d15d88d7289a6617..06db3b7de3dee40aacad9314b6701482a30c01f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-22  Hollis Blanchard  <hollis@penguinppc.org>
+
+       * util/powerpc/ieee1275/grub-install.in: Run the mount point
+       check before installing files.
+
 2005-11-22  Mike Small  <smallm@panix.com>
 
        * util/powerpc/ieee1275/grub-install.in (grubdir): Fixed partition

diff --git a/util/powerpc/ieee1275/grub-install.in b/util/powerpc/ieee1275/grub-install.in
index 4405894fdcdbdbf58cdf661923b62175b956e0cf..42542bd2b074b400ed798eba82f50d487cef936a 100644 (file)
--- a/util/powerpc/ieee1275/grub-install.in
+++ b/util/powerpc/ieee1275/grub-install.in
@@ -120,6 +120,14 @@ else
     exit 1
 fi
 
+# Find the partition at the right mount point.
+install_device=`awk '$2 == '"\"$grubdir\""' { print $1 }' < /proc/mounts`
+if test "x$install_device" = x; then
+    echo "$grubdir must be a mount point."
+    exit 1
+fi
+# XXX warn on firmware-unreadable filesystems?
+
 # Create the GRUB directory if it is not present.
 test -d "$bootdir" || mkdir "$bootdir" || exit 1
 test -d "$grubdir" || mkdir "$grubdir" || exit 1
@@ -144,15 +152,6 @@ fi
 "$grub_mkimage" --output=${grubdir}/grub $modules || exit 1
 
 if test $update_nvram = yes; then
-    # Find the partition at the right mount point.
-    install_device=`awk '$2 == '"\"$grubdir\""' { print $1 }' < /proc/mounts`
-    if test "x$install_device" = x; then
-       # Uh oh... grub-mkimage installed into a plain directory somewhere.
-       echo "$grubdir is not a mount point!"
-       exit 1
-    fi
-    # XXX warn on firmware-unreadable filesystems?
-
     set $ofpathname dummy
     if test -f "$1"; then
        :