diff -u -u -r1.5 -r1.6
--- support/build_image.sh	17 May 2004 19:31:04 -0000	1.5
+++ support/build_image.sh	11 Jun 2005 11:23:51 -0000	1.6
@@ -104,9 +104,14 @@
     fi
   done
 
+  # Try to guess with whereis (Credits to s[e]th & h[o]lth)
+  if [ ! -d "$GRUBDIR" ] ; then
+    GRUBDIR=`whereis grub | awk '{ print "find "$3" -name stage2" }' | sh | xargs dirname 2>/dev/null`
+  fi
+
   # Try to guess with locate
   if [ ! -d "$GRUBDIR" ] ; then
-    GRUBDIR=`locate stage2 | head -1 | xargs dirname 2>/dev/null`
+     GRUBDIR=`locate stage2 | head -1 | xargs dirname 2>/dev/null`
   fi
 
   # Look for a correct sbin/grub
@@ -146,7 +151,7 @@
   mmd $1/system
   mmd $1/modules
 
-  $SBIN_GRUB --batch <<EOT 1>/dev/null 2>/dev/null || exit 1
+  $SBIN_GRUB --batch --no-floppy <<EOT 1>/dev/null 2>/dev/null || exit 1
 device (fd0) $IMG_FNAME
 install (fd0)/boot/grub/stage1 (fd0) (fd0)/boot/grub/stage2 p (fd0)/boot/grub/menu.txt
 quit