2007-05-20 Robert Millan <rmh@aybabtu.com>

* util/update-grub_lib.in: New file.
	* DISTLIST: Add update-grub_lib.in.
	* conf/common.rmk: Generate update-grub_lib and install it in
	$(lib_DATA).
	* Makefile.in: Add install routine for $(lib_DATA).

	* util/grub.d/00_header.in: Use convert_system_path_to_grub_path()
	function provided by update-grub_lib to support arbitrary paths of
	unifont.pff.
	* util/update-grub.in: Use convert_system_path_to_grub_path() to
	initialize GRUB_DRIVE_BOOT and GRUB_DRIVE_BOOT_GRUB variables.

ChangeLog

@@ -1,3 +1,17 @@
+2007-05-20  Robert Millan  <rmh@aybabtu.com>
+
+	* util/update-grub_lib.in: New file.
+	* DISTLIST: Add update-grub_lib.in.
+	* conf/common.rmk: Generate update-grub_lib and install it in
+	$(lib_DATA).
+	* Makefile.in: Add install routine for $(lib_DATA).
+
+	* util/grub.d/00_header.in: Use convert_system_path_to_grub_path()
+	function provided by update-grub_lib to support arbitrary paths of
+	unifont.pff.
+	* util/update-grub.in: Use convert_system_path_to_grub_path() to
+	initialize GRUB_DRIVE_BOOT and GRUB_DRIVE_BOOT_GRUB variables.
+
 2007-05-19  Robert Millan  <rmh@aybabtu.com>
 
 	* commands/i386/cpuid.c: New module.

DISTLIST

@@ -264,6 +264,7 @@ util/raid.c
 util/resolve.c
 util/unifont2pff.rb
 util/update-grub.in
+util/update-grub_lib.in
 util/grub.d/00_header.in
 util/grub.d/10_hurd.in
 util/grub.d/10_linux.in

Makefile.in

@@ -86,7 +86,7 @@ RMKFILES = $(addprefix conf/,common.rmk i386-pc.rmk powerpc-ieee1275.rmk \
 MKFILES = $(patsubst %.rmk,%.mk,$(RMKFILES))
 
 DATA = $(pkgdata_IMAGES) $(pkgdata_MODULES) $(pkgdata_PROGRAMS) \
-	$(pkgdata_DATA)
+	$(pkgdata_DATA) $(lib_DATA)
 PROGRAMS = $(bin_UTILITIES) $(sbin_UTILITIES)
 SCRIPTS = $(sbin_SCRIPTS) $(update-grub_SCRIPTS)
 
@@ -165,6 +165,13 @@ install-local: all
 	  dest="`echo $$file | sed 's,.*/,,' | sed '$(transform)'`"; \
 	  $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(sysconfdir)/grub.d/$$dest; \
 	done
+	$(mkinstalldirs) $(DESTDIR)$(libdir)/grub
+	@list='$(lib_DATA)'; \
+	for file in $$list; do \
+	  if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \
+	  dest="`echo $$file | sed 's,.*/,,'`"; \
+	  $(INSTALL_DATA) $$dir$$file $(DESTDIR)$(libdir)/grub/$$dest; \
+	done
 
 install-strip:
 	$(MAKE) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" install

conf/common.rmk

@@ -25,6 +25,12 @@ update-grub: util/update-grub.in config.status
 sbin_SCRIPTS += update-grub
 CLEANFILES += update-grub
 
+update-grub_lib: util/update-grub_lib.in config.status
+	./config.status --file=$@:$<
+	chmod +x $@
+lib_DATA += update-grub_lib
+CLEANFILES += update-grub_lib
+
 00_header: util/grub.d/00_header.in config.status
 	./config.status --file=$@:$<
 	chmod +x $@

util/grub.d/00_header.in

@@ -17,6 +17,12 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St - Suite 330, Boston, MA 02110, USA.
 
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+
+# for convert_system_path_to_grub_path()
+. ${libdir}/grub/update-grub_lib
 
 if [ "x${GRUB_DEFAULT}" = "x" ] ; then GRUB_DEFAULT=0 ; fi
 if [ "x${GRUB_TIMEOUT}" = "x" ] ; then GRUB_TIMEOUT=5 ; fi
@@ -27,13 +33,19 @@ set timeout=${GRUB_TIMEOUT}
 set root=${GRUB_DRIVE}
 EOF
 
-if test -e /boot/grub/unifont.pff ; then
+# Prefer system path for space reasons (/boot/grub might be a very small
-  cat << EOF
+# partition in case of OpenFirmware, etc).
+for i in /usr/share/grub/unifont.pff /boot/grub/unifont.pff ; do
+  if test -e $i ; then
+    grub_path=`convert_system_path_to_grub_path $i`
+    cat << EOF
 
-font ${GRUB_DRIVE_BOOT_GRUB}/unifont.pff
+font ${grub_path}
 set gfxmode=640x480
 insmod gfxterm
 insmod vbe
 terminal gfxterm
 EOF
-fi
+    break
+  fi
+done

util/update-grub.in

@@ -22,6 +22,7 @@ transform="@program_transform_name@"
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 sbindir=@sbindir@
+libdir=@libdir@
 sysconfdir=@sysconfdir@
 grub_prefix=`echo /boot/grub | sed ${transform}`
 grub_cfg=${grub_prefix}/grub.cfg
@@ -30,6 +31,9 @@ update_grub_dir=${sysconfdir}/grub.d
 grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}`
 grub_probe=${sbindir}/`echo grub-probe | sed ${transform}`
 
+# for convert_system_path_to_grub_path()
+. ${libdir}/grub/update-grub_lib
+
 if [ "x$UID" = "x" ] ; then
   UID=`id -u`
 fi
@@ -76,18 +80,10 @@ GRUB_FS="`grub-probe --target=fs /`"
 GRUB_DRIVE="`grub-probe --target=drive /`"
 
 # GRUB path to /boot
-if [ "x`stat -c %d /`" = "x`stat -c %d /boot/`" ] ; then
+GRUB_DRIVE_BOOT="`convert_system_path_to_grub_path /boot`"
-  GRUB_DRIVE_BOOT="${GRUB_DRIVE}/boot"
-else
-  GRUB_DRIVE_BOOT="`grub-probe --target=drive /boot`"
-fi
 
 # GRUB path to /boot/grub
-if [ "x`stat -c %d /boot`" = "x`stat -c %d /boot/grub`" ] ; then
+GRUB_DRIVE_BOOT_GRUB="`convert_system_path_to_grub_path /boot/grub`"
-  GRUB_DRIVE_BOOT_GRUB="${GRUB_DRIVE_BOOT}/grub"
-else
-  GRUB_DRIVE_BOOT_GRUB="`grub-probe --target=drive /boot/grub`"
-fi
 
 if test -f ${sysconfdir}/default/grub ; then
   . ${sysconfdir}/default/grub

util/update-grub_lib.in

@@ -0,0 +1,49 @@
+# Helper library for update-grub
+# Copyright (C) 2007 Free Software Foundation, Inc.
+#
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St - Suite 330, Boston, MA 02110, USA.
+
+transform="@program_transform_name@"
+
+sbindir=@sbindir@
+
+grub_probe=${sbindir}/`echo grub-probe | sed ${transform}`
+
+convert_system_path_to_grub_path ()
+{
+  dir=$1
+  dir=`readlink -f $dir`
+
+  drive=`${grub_probe} -t drive $dir`
+  if [ "x$drive" = "x" ] ; then
+    return 1
+  fi
+
+  num=`stat -c %d $dir`
+  relative_path=""
+  while : ; do
+    parent=`echo $dir | sed -e "s,/[^/]*$,,g" -e "s,^$,/,g"`
+    if [ "x`stat -c %d $parent`" = "x$num" ] ; then : ; else
+      break
+    fi
+    if [ "x$dir" = "x/" ] ; then
+      break
+    fi
+    relative_path=`echo $dir | sed -e "s,^.*/,/,g"`$relative_path
+    dir=$parent
+  done
+
+  echo ${drive}${relative_path}
+}