From 06ab5303336f853dc42b82ef7c821110618bf466 Mon Sep 17 00:00:00 2001
From: robertmh <robertmh@localhost>
Date: Wed, 23 Jan 2008 11:25:52 +0000
Subject: [PATCH] 2008-01-23  Robert Millan  <rmh@aybabtu.com>

        * kern/i386/pc/init.c (make_install_device): When memdisk image is
        present, "(memdisk)/boot/grub" becomes the default prefix.

        * util/i386/pc/grub-mkrescue.in: Switch to a minimal core.img plus
        a memdisk tarball with all the modules.  Add --overlay=DIR option that
        allows users to overlay additional files into the image.
---
 ChangeLog                     |  9 +++++++++
 kern/i386/pc/init.c           |  7 ++++++-
 util/i386/pc/grub-mkrescue.in | 24 +++++++++++++++++++-----
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3c2463a3a..8e8f6482d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-01-23  Robert Millan  <rmh@aybabtu.com>
+
+	* kern/i386/pc/init.c (make_install_device): When memdisk image is
+	present, "(memdisk)/boot/grub" becomes the default prefix.
+
+	* util/i386/pc/grub-mkrescue.in: Switch to a minimal core.img plus
+	a memdisk tarball with all the modules.  Add --overlay=DIR option that
+	allows users to overlay additional files into the image.
+
 2008-01-23  Robert Millan  <rmh@aybabtu.com>
 
 	* conf/i386-ieee1275.rmk (kernel_elf_SOURCES): Add `machine/loader.h'
diff --git a/kern/i386/pc/init.c b/kern/i386/pc/init.c
index 0cf81d769..acaf20b7e 100644
--- a/kern/i386/pc/init.c
+++ b/kern/i386/pc/init.c
@@ -64,7 +64,12 @@ make_install_device (void)
   /* XXX: This should be enough.  */
   char dev[100];
 
-  if (grub_install_dos_part != -2)
+  if (grub_memdisk_image_size)
+    {
+      grub_sprintf (dev, "(memdisk)%s", grub_prefix);
+      grub_strcpy (grub_prefix, dev);
+    }
+  else if (grub_install_dos_part != -2)
     {
       grub_sprintf (dev, "(%cd%u",
 		    (grub_boot_drive & 0x80) ? 'h' : 'f',
diff --git a/util/i386/pc/grub-mkrescue.in b/util/i386/pc/grub-mkrescue.in
index 20fa13025..87b36b9c6 100644
--- a/util/i386/pc/grub-mkrescue.in
+++ b/util/i386/pc/grub-mkrescue.in
@@ -42,6 +42,7 @@ Make GRUB rescue image.
   -h, --help              print this message and exit
   -v, --version           print the version information and exit
   --modules=MODULES       pre-load specified modules MODULES
+  --overlay=DIR           overlay directory DIR in the memdisk image
   --pkglibdir=DIR         use images from directory DIR instead of ${pkglibdir}
   --grub-mkimage=FILE     use FILE as grub-mkimage
   --image-type=TYPE       select floppy or cdrom (default)
@@ -67,6 +68,8 @@ for option in "$@"; do
 	exit 0 ;;
     --modules=*)
 	modules=`echo "$option" | sed 's/--modules=//'` ;;
+    --overlay=*)
+	overlay=`echo "$option" | sed 's/--overlay=//'` ;;
     --pkglibdir=*)
 	input_dir=`echo "$option" | sed 's/--pkglibdir=//'` ;;
     --grub-mkimage=*)
@@ -99,18 +102,29 @@ if test "x$output_image" = x; then
   exit 1
 fi
 
-if [ "x${modules}" = "x" ] ; then
-  modules=`cd ${input_dir}/ && ls *.mod`
-fi
-
 if [ "x${image_type}" = "xfloppy" ] ; then
   floppy_image=${output_image}
 else
   floppy_image=`mktemp`
 fi
 
+memdisk_dir=`mktemp -d`
+mkdir -p ${memdisk_dir}/boot/grub
+cp ${input_dir}/*.mod \
+  ${input_dir}/command.lst ${input_dir}/moddep.lst ${input_dir}/fs.lst \
+  ${memdisk_dir}/boot/grub/
+
+if test "x$overlay" = x ; then : ; else
+  cp -dpR ${overlay}/* ${memdisk_dir}/
+fi
+
+memdisk_img=`mktemp`
+tar -C ${memdisk_dir} -cf ${memdisk_img} boot
+rm -rf ${memdisk_dir}
+
 core_img=`mktemp`
-${grub_mkimage} -d ${input_dir}/ -o ${core_img} ${modules}
+${grub_mkimage} -d ${input_dir}/ -m ${memdisk_img} -o ${core_img} memdisk cpio biosdisk ${modules}
+rm -f ${memdisk_img}
 cat ${input_dir}/boot.img ${core_img} /dev/zero | dd bs=1024 count=1440 > $floppy_image
 rm -f ${core_img}