[PATCH] memdisk + grub-mkrescue

[PATCH] memdisk + grub-mkrescue

[Robert Millan]

[-- Attachment #1: Type: text/plain, Size: 238 bytes --]


These two were predestined to get together..  attached patch for their
wedding.

Comments?

-- 
Robert Millan

<GPLv2> I know my rights; I want my phone call!
<DRM> What use is a phone call… if you are unable to speak?
(as seen on /.)

[-- Attachment #2: memdisk_and_mkrescue_marriage.diff --]
[-- Type: text/x-diff, Size: 2945 bytes --]


	* 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.

diff -x '*~' -x '*.mk' -Nurp grub2/kern/i386/pc/init.c memdisk/kern/i386/pc/init.c
--- grub2/kern/i386/pc/init.c	2008-01-21 00:41:58.000000000 +0100
+++ memdisk/kern/i386/pc/init.c	2008-01-21 16:54:55.000000000 +0100
@@ -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 -x '*~' -x '*.mk' -Nurp grub2/util/i386/pc/grub-mkrescue.in memdisk/util/i386/pc/grub-mkrescue.in
--- grub2/util/i386/pc/grub-mkrescue.in	2007-07-22 01:32:32.000000000 +0200
+++ memdisk/util/i386/pc/grub-mkrescue.in	2008-01-21 17:46:04.000000000 +0100
@@ -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}
 

Re: [PATCH] memdisk + grub-mkrescue

[Pavel Roskin]

On Mon, 2008-01-21 at 17:52 +0100, Robert Millan wrote:
> These two were predestined to get together..  attached patch for their
> wedding.
> 
> Comments?

I really like the ability to add more things than just modules
(especially grub.cfg and fonts).  Is that the main motivation for your
patch?  Or you have some other things in mind?

I've tested the patch, and it seems to be OK, although I was surprised
to see an empty menu on startup.  Perhaps a command line would be more
appropriate in absence of grub.cfg?

I don't quite understand why "biosdisk" needs to be mandatory.  I guess
it's not initialized by default, so that it doesn't conflict with the
ata module.  But ata can load on top of biosdisk (but not the other way
around).

-- 
Regards,
Pavel Roskin

Re: [PATCH] memdisk + grub-mkrescue

[Robert Millan]

On Mon, Jan 21, 2008 at 12:47:06PM -0500, Pavel Roskin wrote:
> On Mon, 2008-01-21 at 17:52 +0100, Robert Millan wrote:
> > These two were predestined to get together..  attached patch for their
> > wedding.
> > 
> > Comments?
> 
> I really like the ability to add more things than just modules
> (especially grub.cfg and fonts).  Is that the main motivation for your
> patch?  Or you have some other things in mind?

Yes, that's it.  Specially for situations in which there's no other way
(like netboot images, or in the future coreboot when it works on ELF).

> I don't quite understand why "biosdisk" needs to be mandatory.  I guess
> it's not initialized by default, so that it doesn't conflict with the
> ata module.  But ata can load on top of biosdisk (but not the other way
> around).

I just added it because we don't seem to have a way to define which modules
should be autoloaded (other than grub.cfg itself).  And I'm afraid not loading
it by default will confuse users.  I don't know how to improve this, but ideas
are welcome, of course.

-- 
Robert Millan

<GPLv2> I know my rights; I want my phone call!
<DRM> What use is a phone call… if you are unable to speak?
(as seen on /.)

Re: [PATCH] memdisk + grub-mkrescue

[Pavel Roskin]

On Mon, 2008-01-21 at 22:06 +0100, Robert Millan wrote:
> On Mon, Jan 21, 2008 at 12:47:06PM -0500, Pavel Roskin wrote:
> > On Mon, 2008-01-21 at 17:52 +0100, Robert Millan wrote:
> > > These two were predestined to get together..  attached patch for their
> > > wedding.
> > > 
> > > Comments?
> > 
> > I really like the ability to add more things than just modules
> > (especially grub.cfg and fonts).  Is that the main motivation for your
> > patch?  Or you have some other things in mind?
> 
> Yes, that's it.  Specially for situations in which there's no other way
> (like netboot images, or in the future coreboot when it works on ELF).

I wish I could use it on PowerPC to work around the "claim failed"
problem, but I'll still need to link "memdisk" and "cpio" with
grub-mkimage.

I have a patch for PowerPC, but I think I'll hold it until your patch is
committed.  I could change my patch to be more in-sync with i386, in
particular use /boot/grub as the blessed directory.

> > I don't quite understand why "biosdisk" needs to be mandatory.  I guess
> > it's not initialized by default, so that it doesn't conflict with the
> > ata module.  But ata can load on top of biosdisk (but not the other way
> > around).
> 
> I just added it because we don't seem to have a way to define which modules
> should be autoloaded (other than grub.cfg itself).  And I'm afraid not loading
> it by default will confuse users.  I don't know how to improve this, but ideas
> are welcome, of course.

Actually, if biosdisk is a part of the core image, other modules are
preloaded.  I don't quite understand the mechanism.  I think it should
be OK for now.  Then we can refine the loading and the initialization.

-- 
Regards,
Pavel Roskin

Re: [PATCH] memdisk + grub-mkrescue

[Robert Millan]

On Mon, Jan 21, 2008 at 09:11:04PM -0500, Pavel Roskin wrote:
> 
> I wish I could use it on PowerPC to work around the "claim failed"
> problem, but I'll still need to link "memdisk" and "cpio" with
> grub-mkimage.

I don't understand.  How would this work around the problem?

> I have a patch for PowerPC, but I think I'll hold it until your patch is
> committed.  I could change my patch to be more in-sync with i386, in
> particular use /boot/grub as the blessed directory.

Cool!  Could you send it to the list?  I'd like to see if it'll work on
i386-elf targets.

> > I just added it because we don't seem to have a way to define which modules
> > should be autoloaded (other than grub.cfg itself).  And I'm afraid not loading
> > it by default will confuse users.  I don't know how to improve this, but ideas
> > are welcome, of course.
> 
> Actually, if biosdisk is a part of the core image, other modules are
> preloaded.  I don't quite understand the mechanism.

Ah.  Could be, yes.  The mechanism is basicaly that GRUB checks for an *.lst
file (I forgot which) which teaches it which dependencies each module has.

In core.img build time I don't know, but it's probably the same.

-- 
Robert Millan

<GPLv2> I know my rights; I want my phone call!
<DRM> What use is a phone call… if you are unable to speak?
(as seen on /.)

Re: [PATCH] memdisk + grub-mkrescue

[Pavel Roskin]

[-- Attachment #1: Type: text/plain, Size: 1201 bytes --]

Quoting Robert Millan <rmh@aybabtu.com>:

> On Mon, Jan 21, 2008 at 09:11:04PM -0500, Pavel Roskin wrote:
>>
>> I wish I could use it on PowerPC to work around the "claim failed"
>> problem, but I'll still need to link "memdisk" and "cpio" with
>> grub-mkimage.
>
> I don't understand.  How would this work around the problem?

It would work around the problem if appending modules to kernel.elf  
with grub-mkimage could be completely avoided.

>> I have a patch for PowerPC, but I think I'll hold it until your patch is
>> committed.  I could change my patch to be more in-sync with i386, in
>> particular use /boot/grub as the blessed directory.
>
> Cool!  Could you send it to the list?  I'd like to see if it'll work on
> i386-elf targets.

OK, attached.  Sorry, this mailer would break the patch otherwise.

> Ah.  Could be, yes.  The mechanism is basicaly that GRUB checks for an *.lst
> file (I forgot which) which teaches it which dependencies each module has.
>
> In core.img build time I don't know, but it's probably the same.

That explains why biosdisk is not loaded by itself.  No module depends  
on it (which is correct).

-- 
Regards,
Pavel Roskin


[-- Attachment #2: 05-ppc-mkrescue.patch --]
[-- Type: text/x-patch, Size: 5720 bytes --]

Create mkrescue for PowerPC

From: Pavel Roskin <proski@gnu.org>


---

 DISTLIST                               |    1 
 conf/powerpc-ieee1275.mk               |   10 +++
 conf/powerpc-ieee1275.rmk              |    4 +
 util/powerpc/ieee1275/grub-mkrescue.in |  115 ++++++++++++++++++++++++++++++++
 4 files changed, 130 insertions(+), 0 deletions(-)
 create mode 100644 util/powerpc/ieee1275/grub-mkrescue.in


diff --git a/DISTLIST b/DISTLIST
index c2766b4..bf164b6 100644
--- a/DISTLIST
+++ b/DISTLIST
@@ -326,6 +326,7 @@ util/i386/pc/misc.c
 util/i386/pc/grub-mkrescue.in
 util/ieee1275/get_disk_name.c
 util/powerpc/ieee1275/grub-install.in
+util/powerpc/ieee1275/grub-mkrescue.in
 util/powerpc/ieee1275/misc.c
 video/bitmap.c
 video/video.c
diff --git a/conf/powerpc-ieee1275.mk b/conf/powerpc-ieee1275.mk
index 1dc4b3f..efe912e 100644
--- a/conf/powerpc-ieee1275.mk
+++ b/conf/powerpc-ieee1275.mk
@@ -663,6 +663,7 @@ kernel_elf_LDFLAGS = $(COMMON_LDFLAGS) -static-libgcc -lgcc \
 
 # Scripts.
 sbin_SCRIPTS = grub-install
+bin_SCRIPTS = grub-mkrescue
 
 # For grub-install.
 grub_install_SOURCES = util/powerpc/ieee1275/grub-install.in
@@ -673,6 +674,15 @@ grub-install: util/powerpc/ieee1275/grub-install.in config.status
 	chmod +x $@
 
 
+# For grub-mkrescue.
+grub_mkrescue_SOURCES = util/powerpc/ieee1275/grub-mkrescue.in
+CLEANFILES += grub-mkrescue
+
+grub-mkrescue: util/powerpc/ieee1275/grub-mkrescue.in config.status
+	./config.status --file=grub-mkrescue:util/powerpc/ieee1275/grub-mkrescue.in
+	chmod +x $@
+
+
 # Modules.
 pkglib_MODULES = halt.mod \
 	_linux.mod \
diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk
index d26bcb5..e05565d 100644
--- a/conf/powerpc-ieee1275.rmk
+++ b/conf/powerpc-ieee1275.rmk
@@ -97,10 +97,14 @@ kernel_elf_LDFLAGS = $(COMMON_LDFLAGS) -static-libgcc -lgcc \
 
 # Scripts.
 sbin_SCRIPTS = grub-install
+bin_SCRIPTS = grub-mkrescue
 
 # For grub-install.
 grub_install_SOURCES = util/powerpc/ieee1275/grub-install.in
 
+# For grub-mkrescue.
+grub_mkrescue_SOURCES = util/powerpc/ieee1275/grub-mkrescue.in
+
 # Modules.
 pkglib_MODULES = halt.mod \
 	_linux.mod \
diff --git a/util/powerpc/ieee1275/grub-mkrescue.in b/util/powerpc/ieee1275/grub-mkrescue.in
new file mode 100644
index 0000000..3b33d16
--- /dev/null
+++ b/util/powerpc/ieee1275/grub-mkrescue.in
@@ -0,0 +1,115 @@
+#! /bin/sh -e
+
+# Make GRUB rescue image
+# Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007  Free Software Foundation, Inc.
+#
+# GRUB 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 3 of the License, or
+# (at your option) any later version.
+#
+# GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.
+
+# Initialize some variables.
+transform="@program_transform_name@"
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+bindir=@bindir@
+libdir=@libdir@
+PACKAGE_NAME=@PACKAGE_NAME@
+PACKAGE_TARNAME=@PACKAGE_TARNAME@
+PACKAGE_VERSION=@PACKAGE_VERSION@
+target_cpu=@target_cpu@
+platform=@platform@
+pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}`
+
+grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}`
+
+# Usage: usage
+# Print the usage.
+usage () {
+    cat <<EOF
+Usage: grub-mkrescue [OPTION] output_image
+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
+  --pkglibdir=DIR         use images from directory DIR
+                          default: ${pkglibdir}
+  --grub-mkimage=FILE     use FILE as grub-mkimage
+
+grub-mkimage generates a bootable rescue CD image.
+
+Report bugs to <grub-devel@gnu.org>.
+EOF
+}
+
+input_dir=${pkglibdir}
+grub_mkimage=grub-mkimage
+
+# Check the arguments.
+for option in "$@"; do
+    case "$option" in
+    -h | --help)
+	usage
+	exit 0 ;;
+    -v | --version)
+	echo "grub-install (GNU GRUB ${PACKAGE_VERSION})"
+	exit 0 ;;
+    --modules=*)
+	modules=`echo "$option" | sed 's/--modules=//'` ;;
+    --pkglibdir=*)
+	input_dir=`echo "$option" | sed 's/--pkglibdir=//'` ;;
+    --grub-mkimage=*)
+	grub_mkimage=`echo "$option" | sed 's/--grub-mkimage=//'` ;;
+    -*)
+	echo "Unrecognized option \`$option'" 1>&2
+	usage
+	exit 1
+	;;
+    *)
+	if test "x$output_image" != x; then
+	    echo "Unrecognized option \`$option'" 1>&2
+	    usage
+	    exit 1
+	fi
+	output_image="${option}" ;;
+    esac
+done
+
+if test "x$output_image" = x; then
+  usage
+  exit 1
+fi
+
+if [ "x${modules}" = "x" ] ; then
+  modules=`cd ${input_dir}/ && ls *.mod`
+fi
+
+map_file=`mktemp`
+cat >${map_file} <<EOF
+# EXTN          XLate   CREATOR   TYPE     Comment
+grub.img        Raw     'UNIX'    'tbxi'   "bootstrap"
+EOF
+
+iso_dir=`mktemp -d`
+boot_dir=${iso_dir}/boot/grub
+mkdir ${iso_dir}/boot
+mkdir ${boot_dir}
+core_img=${boot_dir}/grub.img
+${grub_mkimage} -d ${input_dir}/ -o ${core_img} ${modules}
+genisoimage -hfs -part -no-desktop -r -J -o ${output_image} \
+ -map ${map_file} -hfs-bless ${boot_dir} ${iso_dir}
+
+rm -rf ${iso_dir}
+rm -f ${map_file}
+
+exit 0

Re: [PATCH] memdisk + grub-mkrescue

[Robert Millan]

On Tue, Jan 22, 2008 at 09:55:43AM -0500, Pavel Roskin wrote:
> >On Mon, Jan 21, 2008 at 09:11:04PM -0500, Pavel Roskin wrote:
> >>
> >>I wish I could use it on PowerPC to work around the "claim failed"
> >>problem, but I'll still need to link "memdisk" and "cpio" with
> >>grub-mkimage.
> >
> >I don't understand.  How would this work around the problem?
> 
> It would work around the problem if appending modules to kernel.elf  
> with grub-mkimage could be completely avoided.

Ah, I see.  But as you point out, you still need memdisk and cpio.  Maybe we
could put these two in kernel when we have "grub-mkimage -m" support for ELF,
but it looks very ugly to me! :-)

> >>I have a patch for PowerPC, but I think I'll hold it until your patch is
> >>committed.  I could change my patch to be more in-sync with i386, in
> >>particular use /boot/grub as the blessed directory.
> >
> >Cool!  Could you send it to the list?  I'd like to see if it'll work on
> >i386-elf targets.
> 
> OK, attached.  Sorry, this mailer would break the patch otherwise.

Ah, I think I missunderstood.  I thought you implemented "grub-mkimage -m"
switch.

> +# Make GRUB rescue image
> +# Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007  Free Software Foundation, Inc.

Missing 2008 here.

> +map_file=`mktemp`
> +cat >${map_file} <<EOF
> +# EXTN          XLate   CREATOR   TYPE     Comment
> +grub.img        Raw     'UNIX'    'tbxi'   "bootstrap"
> +EOF

How standard is this format?  Is this targetted only at one OFW vendor?

> +genisoimage -hfs -part -no-desktop -r -J -o ${output_image} \
> + -map ${map_file} -hfs-bless ${boot_dir} ${iso_dir}

Same here.

Perhaps this should be mentioned in --help or something?

In the future we could add --image-type= options for other platforms
like i386-pc does with floppy/cdrom ?

-- 
Robert Millan

<GPLv2> I know my rights; I want my phone call!
<DRM> What use is a phone call… if you are unable to speak?
(as seen on /.)

Re: [PATCH] memdisk + grub-mkrescue

[Pavel Roskin]

Quoting Robert Millan <rmh@aybabtu.com>:

> On Tue, Jan 22, 2008 at 09:55:43AM -0500, Pavel Roskin wrote:
>> >On Mon, Jan 21, 2008 at 09:11:04PM -0500, Pavel Roskin wrote:
>> >>
>> >>I wish I could use it on PowerPC to work around the "claim failed"
>> >>problem, but I'll still need to link "memdisk" and "cpio" with
>> >>grub-mkimage.
>> >
>> >I don't understand.  How would this work around the problem?
>>
>> It would work around the problem if appending modules to kernel.elf
>> with grub-mkimage could be completely avoided.
>
> Ah, I see.  But as you point out, you still need memdisk and cpio.  Maybe we
> could put these two in kernel when we have "grub-mkimage -m" support for ELF,
> but it looks very ugly to me! :-)

I think I'll submit a patch that introduces the gap between the core  
end and the modules.  It's better that nothing.  There was a gap  
before, just much bigger.

>> >>I have a patch for PowerPC, but I think I'll hold it until your patch is
>> >>committed.  I could change my patch to be more in-sync with i386, in
>> >>particular use /boot/grub as the blessed directory.
>> >
>> >Cool!  Could you send it to the list?  I'd like to see if it'll work on
>> >i386-elf targets.
>>
>> OK, attached.  Sorry, this mailer would break the patch otherwise.
>
> Ah, I think I missunderstood.  I thought you implemented "grub-mkimage -m"
> switch.

Sorry, not yet.

>> +# Make GRUB rescue image
>> +# Copyright (C) 1999,2000,2001,2002,2003,2004,2005,2006,2007  Free  
>>  Software Foundation, Inc.
>
> Missing 2008 here.
>
>> +map_file=`mktemp`
>> +cat >${map_file} <<EOF
>> +# EXTN          XLate   CREATOR   TYPE     Comment
>> +grub.img        Raw     'UNIX'    'tbxi'   "bootstrap"
>> +EOF
>
> How standard is this format?  Is this targetted only at one OFW vendor?

The text format is probably specific to genisoimage.  But the  
attributes themselves are used by PowerPC based Apple machines.  Macs  
look for bootloader in the "blessed" directory.  The bootloader should  
have "tbxi" type.

I haven't tried to emulate CHRP and PREP yet.  I know that Fedora  
LiveCD generator uses additional tricks for both.  I think it's  
possible to support them.

>> +genisoimage -hfs -part -no-desktop -r -J -o ${output_image} \
>> + -map ${map_file} -hfs-bless ${boot_dir} ${iso_dir}
>
> Same here.

It's all hfs specific.

> Perhaps this should be mentioned in --help or something?

Maybe.

> In the future we could add --image-type= options for other platforms
> like i386-pc does with floppy/cdrom ?

My Mac has no floppy, but if qemu emulates it correctly, I could try it.

I understand that PREP need some "boot image" that needs to be put on  
the CD, so that's another possible image type.

-- 
Regards,
Pavel Roskin

Re: [PATCH] memdisk + grub-mkrescue

[Robert Millan]

On Wed, Jan 23, 2008 at 02:51:00AM -0500, Pavel Roskin wrote:
> 
> I think I'll submit a patch that introduces the gap between the core  
> end and the modules.  It's better that nothing.  There was a gap  
> before, just much bigger.

Ah, we had this before?  You mean before Hollis removed it, right?

> >In the future we could add --image-type= options for other platforms
> >like i386-pc does with floppy/cdrom ?
> 
> My Mac has no floppy, but if qemu emulates it correctly, I could try it.
> 
> I understand that PREP need some "boot image" that needs to be put on  
> the CD, so that's another possible image type.

What I mean is that we have things like --image-type=prep|whatever.  Although
maybe it is confusing..

-- 
Robert Millan

<GPLv2> I know my rights; I want my phone call!
<DRM> What use is a phone call… if you are unable to speak?
(as seen on /.)

Re: [PATCH] memdisk + grub-mkrescue

[Pavel Roskin]

Quoting Robert Millan <rmh@aybabtu.com>:

> On Wed, Jan 23, 2008 at 02:51:00AM -0500, Pavel Roskin wrote:
>>
>> I think I'll submit a patch that introduces the gap between the core
>> end and the modules.  It's better that nothing.  There was a gap
>> before, just much bigger.
>
> Ah, we had this before?  You mean before Hollis removed it, right?

Yes.  That's it:

-/* Where grub-mkimage places the core modules in memory.  */
-#define GRUB_IEEE1275_MODULE_BASE 0x00300000

It's not exactly a gap per se, but if the modules are placed at 3 Mb,  
there would be a gap.

> What I mean is that we have things like --image-type=prep|whatever.  Although
> maybe it is confusing..

I see.  Considering that there is enough space on a CD, I'd go with  
universal images, if at all possible.

-- 
Regards,
Pavel Roskin

Re: [PATCH] memdisk + grub-mkrescue

[Marco Gerards]

Pavel Roskin <proski@gnu.org> writes:

> Quoting Robert Millan <rmh@aybabtu.com>:
>
>> On Wed, Jan 23, 2008 at 02:51:00AM -0500, Pavel Roskin wrote:
>>>
>>> I think I'll submit a patch that introduces the gap between the core
>>> end and the modules.  It's better that nothing.  There was a gap
>>> before, just much bigger.
>>
>> Ah, we had this before?  You mean before Hollis removed it, right?
>
> Yes.  That's it:
>
> -/* Where grub-mkimage places the core modules in memory.  */
> -#define GRUB_IEEE1275_MODULE_BASE 0x00300000
>
> It's not exactly a gap per se, but if the modules are placed at 3 Mb,
> there would be a gap.
>
>> What I mean is that we have things like --image-type=prep|whatever.  Although
>> maybe it is confusing..
>
> I see.  Considering that there is enough space on a CD, I'd go with
> universal images, if at all possible.

If you mean UDF, it is not supported (yet).

--
Marco

Re: [PATCH] memdisk + grub-mkrescue

[Pavel Roskin]

On Wed, 2008-01-23 at 20:03 +0100, Marco Gerards wrote:
> > I see.  Considering that there is enough space on a CD, I'd go with
> > universal images, if at all possible.
> 
> If you mean UDF, it is not supported (yet).

I mean Apple/CHRP/PREP.

-- 
Regards,
Pavel Roskin

Re: [PATCH] memdisk + grub-mkrescue

[Robert Millan]

On Wed, Jan 23, 2008 at 02:28:25PM -0500, Pavel Roskin wrote:
> On Wed, 2008-01-23 at 20:03 +0100, Marco Gerards wrote:
> > > I see.  Considering that there is enough space on a CD, I'd go with
> > > universal images, if at all possible.
> > 
> > If you mean UDF, it is not supported (yet).
> 
> I mean Apple/CHRP/PREP.

Were you going to check this in?  I didn't see any problems with it, IIRC.

-- 
Robert Millan

<GPLv2> I know my rights; I want my phone call!
<DRM> What use is a phone call… if you are unable to speak?
(as seen on /.)

Re: [PATCH] memdisk + grub-mkrescue

[Pavel Roskin]

On Thu, 2008-01-31 at 15:35 +0100, Robert Millan wrote:
> On Wed, Jan 23, 2008 at 02:28:25PM -0500, Pavel Roskin wrote:
> > On Wed, 2008-01-23 at 20:03 +0100, Marco Gerards wrote:
> > > > I see.  Considering that there is enough space on a CD, I'd go with
> > > > universal images, if at all possible.
> > > 
> > > If you mean UDF, it is not supported (yet).
> > 
> > I mean Apple/CHRP/PREP.
> 
> Were you going to check this in?  I didn't see any problems with it, IIRC.

Checked in with ChangeLog fixes suggested by Marco.

-- 
Regards,
Pavel Roskin

Re: [PATCH] memdisk + grub-mkrescue

[Marco Gerards]

Pavel Roskin <proski@gnu.org> writes:

> On Thu, 2008-01-31 at 15:35 +0100, Robert Millan wrote:
>> On Wed, Jan 23, 2008 at 02:28:25PM -0500, Pavel Roskin wrote:
>> > On Wed, 2008-01-23 at 20:03 +0100, Marco Gerards wrote:
>> > > > I see.  Considering that there is enough space on a CD, I'd go with
>> > > > universal images, if at all possible.
>> > > 
>> > > If you mean UDF, it is not supported (yet).
>> > 
>> > I mean Apple/CHRP/PREP.
>> 
>> Were you going to check this in?  I didn't see any problems with it, IIRC.
>
> Checked in with ChangeLog fixes suggested by Marco.

Not entirely, you missed this one:

"> * conf/powerpc-ieee1275.mk: Add grub-mkrescue support.

I guess you mean .rmk?  Please mention the changes you made."

--
Marco

Re: [PATCH] memdisk + grub-mkrescue

[Pavel Roskin]

On Thu, 2008-01-31 at 18:35 +0100, Marco Gerards wrote:
> Pavel Roskin <proski@gnu.org> writes:
> 
> > On Thu, 2008-01-31 at 15:35 +0100, Robert Millan wrote:
> >> On Wed, Jan 23, 2008 at 02:28:25PM -0500, Pavel Roskin wrote:
> >> > On Wed, 2008-01-23 at 20:03 +0100, Marco Gerards wrote:
> >> > > > I see.  Considering that there is enough space on a CD, I'd go with
> >> > > > universal images, if at all possible.
> >> > > 
> >> > > If you mean UDF, it is not supported (yet).
> >> > 
> >> > I mean Apple/CHRP/PREP.
> >> 
> >> Were you going to check this in?  I didn't see any problems with it, IIRC.
> >
> > Checked in with ChangeLog fixes suggested by Marco.
> 
> Not entirely, you missed this one:
> 
> "> * conf/powerpc-ieee1275.mk: Add grub-mkrescue support.
> 
> I guess you mean .rmk?  Please mention the changes you made."

I fixed that part.  It's "rmk" now.  And I don't understand what kind of
changes you want me to describe.  I don't see long descriptions for
changes in *.rmk files.

-- 
Regards,
Pavel Roskin

Re: [PATCH] memdisk + grub-mkrescue

[Marco Gerards]

Pavel Roskin <proski@gnu.org> writes:

> On Thu, 2008-01-31 at 18:35 +0100, Marco Gerards wrote:
>> Pavel Roskin <proski@gnu.org> writes:
>> 
>> > On Thu, 2008-01-31 at 15:35 +0100, Robert Millan wrote:
>> >> On Wed, Jan 23, 2008 at 02:28:25PM -0500, Pavel Roskin wrote:
>> >> > On Wed, 2008-01-23 at 20:03 +0100, Marco Gerards wrote:
>> >> > > > I see.  Considering that there is enough space on a CD, I'd go with
>> >> > > > universal images, if at all possible.
>> >> > > 
>> >> > > If you mean UDF, it is not supported (yet).
>> >> > 
>> >> > I mean Apple/CHRP/PREP.
>> >> 
>> >> Were you going to check this in?  I didn't see any problems with it, IIRC.
>> >
>> > Checked in with ChangeLog fixes suggested by Marco.
>> 
>> Not entirely, you missed this one:
>> 
>> "> * conf/powerpc-ieee1275.mk: Add grub-mkrescue support.
>> 
>> I guess you mean .rmk?  Please mention the changes you made."
>
> I fixed that part.  It's "rmk" now.  And I don't understand what kind of
> changes you want me to describe.  I don't see long descriptions for
> changes in *.rmk files.

What do you mean?  Please check the latest changelog entries.  Changes
are described in detail.  Like when you add a variable, which is what
you did twice.  Can you please correct this, so the history is
complete? :-)

--
Marco

Re: [PATCH] memdisk + grub-mkrescue

[Pavel Roskin]

On Thu, 2008-01-31 at 19:50 +0100, Marco Gerards wrote:

> What do you mean?  Please check the latest changelog entries.  Changes
> are described in detail.  Like when you add a variable, which is what
> you did twice.  Can you please correct this, so the history is
> complete? :-)

Done.

-- 
Regards,
Pavel Roskin

grub_cpio_find_file() finds unexisting files (Re: [PATCH] memdisk + grub-mkrescue)

[Robert Millan]

On Mon, Jan 21, 2008 at 12:47:06PM -0500, Pavel Roskin wrote:
> 
> I've tested the patch, and it seems to be OK, although I was surprised
> to see an empty menu on startup.  Perhaps a command line would be more
> appropriate in absence of grub.cfg?

I wanted to send a new mail about this, and then forgot.

This is because of a bug in cpio.mod.  The menu code thinks grub.cfg is
present due to grub_cpio_find_file() returning here:

      if (!hd.name[0])
        {
          *ofs = 0;
          return GRUB_ERR_NONE;
        }

but I'm too clueless about tar format to figure this out.

-- 
Robert Millan

<GPLv2> I know my rights; I want my phone call!
<DRM> What use is a phone call… if you are unable to speak?
(as seen on /.)

Re: grub_cpio_find_file() finds unexisting files (Re: [PATCH] memdisk + grub-mkrescue)

[Pavel Roskin]

On Mon, 2008-01-21 at 22:09 +0100, Robert Millan wrote:
> On Mon, Jan 21, 2008 at 12:47:06PM -0500, Pavel Roskin wrote:
> > 
> > I've tested the patch, and it seems to be OK, although I was surprised
> > to see an empty menu on startup.  Perhaps a command line would be more
> > appropriate in absence of grub.cfg?
> 
> I wanted to send a new mail about this, and then forgot.
> 
> This is because of a bug in cpio.mod.  The menu code thinks grub.cfg is
> present due to grub_cpio_find_file() returning here:
> 
>       if (!hd.name[0])
>         {
>           *ofs = 0;
>           return GRUB_ERR_NONE;
>         }
> 
> but I'm too clueless about tar format to figure this out.

I guess the meaning of GRUB_ERR_NONE is confusing (no file vs. no
error), and the return value of grub_cpio_find_file() is not well
defined.

Perhaps it should be GRUB_ERR_FILE_NOT_FOUND instead.

-- 
Regards,
Pavel Roskin

Re: grub_cpio_find_file() finds unexisting files (Re: [PATCH] memdisk + grub-mkrescue)

[Bean]

On Jan 22, 2008 10:01 AM, Pavel Roskin <proski@gnu.org> wrote:
>
> On Mon, 2008-01-21 at 22:09 +0100, Robert Millan wrote:
> > On Mon, Jan 21, 2008 at 12:47:06PM -0500, Pavel Roskin wrote:
> > >
> > > I've tested the patch, and it seems to be OK, although I was surprised
> > > to see an empty menu on startup.  Perhaps a command line would be more
> > > appropriate in absence of grub.cfg?
> >
> > I wanted to send a new mail about this, and then forgot.
> >
> > This is because of a bug in cpio.mod.  The menu code thinks grub.cfg is
> > present due to grub_cpio_find_file() returning here:
> >
> >       if (!hd.name[0])
> >         {
> >           *ofs = 0;
> >           return GRUB_ERR_NONE;
> >         }
> >
> > but I'm too clueless about tar format to figure this out.
>
> I guess the meaning of GRUB_ERR_NONE is confusing (no file vs. no
> error), and the return value of grub_cpio_find_file() is not well
> defined.
>
> Perhaps it should be GRUB_ERR_FILE_NOT_FOUND instead.

you're right, i didn't notice this previously.

-- 
Bean

Re: [PATCH] memdisk + grub-mkrescue

[Marco Gerards]

Robert Millan <rmh@aybabtu.com> writes:

> These two were predestined to get together..  attached patch for their
> wedding.
>
> Comments?
>
> -- 
> Robert Millan
>
> <GPLv2> I know my rights; I want my phone call!
> <DRM> What use is a phone call… if you are unable to speak?
> (as seen on /.)
>
>
> 	* kern/i386/pc/init.c (make_install_device): When memdisk image is
> 	present, "(memdisk)/boot/grub" becomes the default prefix.

Sounds sane to me.

> 	* 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.

Overlay means that I can add a grub.cfg easily?

This patch helps me a lot :-)

--
Marco

Re: [PATCH] memdisk + grub-mkrescue

[Robert Millan]

On Wed, Jan 23, 2008 at 11:45:19AM +0100, Marco Gerards wrote:
> Robert Millan <rmh@aybabtu.com> writes:
> 
> > These two were predestined to get together..  attached patch for their
> > wedding.
> >
> > Comments?
> >
> > -- 
> > Robert Millan
> >
> > <GPLv2> I know my rights; I want my phone call!
> > <DRM> What use is a phone call… if you are unable to speak?
> > (as seen on /.)
> >
> >
> > 	* kern/i386/pc/init.c (make_install_device): When memdisk image is
> > 	present, "(memdisk)/boot/grub" becomes the default prefix.
> 
> Sounds sane to me.
> 
> > 	* 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.
> 
> Overlay means that I can add a grub.cfg easily?

It means you can do:

mkdir -p boot/grub
zile boot/grub/grub.cfg
grub-mkrescue --overlay=boot

Of course, it'd be easier if you could just add it directly, but I really
think having this in a separate directory is a good idea (in case user wants
to add random stuff to her memdisk).

So I'm not sure if it can be improved.  Does it seem fine as-is ?

-- 
Robert Millan

<GPLv2> I know my rights; I want my phone call!
<DRM> What use is a phone call… if you are unable to speak?
(as seen on /.)

Re: [PATCH] memdisk + grub-mkrescue

[Marco Gerards]

Robert Millan <rmh@aybabtu.com> writes:

[...]

>> Overlay means that I can add a grub.cfg easily?
>
> It means you can do:
>
> mkdir -p boot/grub
> zile boot/grub/grub.cfg
> grub-mkrescue --overlay=boot
>
> Of course, it'd be easier if you could just add it directly, but I really
> think having this in a separate directory is a good idea (in case user wants
> to add random stuff to her memdisk).
>
> So I'm not sure if it can be improved.  Does it seem fine as-is ?

Seems good to me :-)

--
Marco

Re: [PATCH] memdisk + grub-mkrescue

[Robert Millan]

On Wed, Jan 23, 2008 at 12:20:33PM +0100, Marco Gerards wrote:
> Robert Millan <rmh@aybabtu.com> writes:
> 
> [...]
> 
> >> Overlay means that I can add a grub.cfg easily?
> >
> > It means you can do:
> >
> > mkdir -p boot/grub
> > zile boot/grub/grub.cfg
> > grub-mkrescue --overlay=boot
> >
> > Of course, it'd be easier if you could just add it directly, but I really
> > think having this in a separate directory is a good idea (in case user wants
> > to add random stuff to her memdisk).
> >
> > So I'm not sure if it can be improved.  Does it seem fine as-is ?
> 
> Seems good to me :-)

Ok, committed.

-- 
Robert Millan

<GPLv2> I know my rights; I want my phone call!
<DRM> What use is a phone call… if you are unable to speak?
(as seen on /.)