2002-03-30 Alfred M. Szmidt [EMAIL PROTECTED]
* docs/grub.texi: Updated GNU/Hurd boot entries.
* doc/menu.lst: Updated to reflect changes in docs/grub.texi.
Index: docs/grub.texi
===
RCS file: /cvs/grub/docs/grub.texi,v
retrieving revision 1.55
diff -u -p -r1.55 grub.texi
--- docs/grub.texi 11 Feb 2002 16:44:54 - 1.55
+++ docs/grub.texi 30 Mar 2002 23:40:06 -
@@ -135,9 +135,9 @@ This edition documents version @value{VE
Briefly, a @dfn{boot loader} is the first software program that runs when
a computer starts. It is responsible for loading and transferring
-control to an operating system @dfn{kernel} software (such as the Linux
-or GNU Hurd kernel). The kernel, in turn, initializes the rest of the
-operating system (e.g. a GNU system).
+control to an operating system @dfn{kernel} software (such as Linux
+or GNU Mach). The kernel, in turn, initializes the
+rest of the operating system (e.g. a GNU system).
GNU GRUB is a very powerful boot loader, which can load a wide variety
of free operating systems, as well as proprietary operating systems with
@@ -582,7 +582,7 @@ install GRUB into the MBR of the first I
# @kbd{grub-install /dev/hda}
@end example
-Likewise, under Hurd, this has the same effect:
+Likewise, under GNU/Hurd, this has the same effect:
@example
# @kbd{grub-install /dev/hd0}
@@ -777,12 +777,14 @@ command @code{find /boot/gnumach} or sim
(@pxref{find}).
@item
-Load the kernel and the module, like this:
+Load the kernel and the modules, like this:
@example
@group
-grub @kbd{kernel /boot/gnumach root=hd0s1}
-grub @kbd{module /boot/serverboot}
+grub @kbd{kernel /boot/gnumach root=device:hd0s1}
+grub @kbd{module /hurd/ext2fs.static
+--multiboot-command-line=$@{kernel-command-line@} --host-priv-port=$@{host-port@}
+--device-master-port=$@{device-port@} --exec-server-task=$@{exec-task@} -T typed
+$@{root@} $(task-create) $(task-resume)}
+grub @kbd{module /lib/ld.so.1 /hurd/exec $(exec-task=task-create)}
+
@end group
@end example
@@ -1036,11 +1038,12 @@ displays the argument as is, you can wri
@example
@group
-# For booting the GNU Hurd
+# For booting GNU/Hurd
title GNU/Hurd
root (hd0,0)
-kernel /boot/gnumach.gz root=hd0s1
-module /boot/serverboot.gz
+kernel /boot/gnumach root=device:hd0s1
+module /hurd/ext2fs.static --multiboot-command-line=$@{kernel-command-line@}
+--host-priv-port=$@{host-port@} --device-master-port=$@{device-port@}
+--exec-server-task=$@{exec-task@} -T typed $@{root@} $(task-create) $(task-resume)
+module /lib/ld.so.1 /hurd/exec $(exec-task=task-create)
@end group
@end example
@@ -1048,7 +1051,7 @@ This boots GNU/Hurd from the first hard
@example
@group
-# For booting Linux
+# For booting GNU/Linux
title GNU/Linux
kernel (hd1,0)/vmlinuz root=/dev/hdb1
@end group
@@ -3469,10 +3456,10 @@ EOT
@item GRUB does not recognize my GNU/Hurd partition.
I don't know why, but the authors of FDISK programs have assigned the
-partition type @samp{0x63} to GNU Hurd incorrectly. So use @samp{0x83}
+partition type @samp{0x63} to the GNU Hurd incorrectly. So use @samp{0x83}
if the partition contains ext2fs filesystem, and use @samp{0xA5} if the
-partition contains ffs filesystem, whether the partition owner is Hurd
-or not. We will use @samp{0x63} for GNU Hurd filesystem that has not
+partition contains ffs filesystem, whether the partition owner is the Hurd
+or not. We will use @samp{0x63} for the GNU Hurd filesystem but that has not
been implemented yet.
@item I've installed a recent version of binutils, but GRUB still crashes.
Index: docs/menu.lst
===
RCS file: /cvs/grub/docs/menu.lst,v
retrieving revision 1.10
diff -u -p -r1.10 menu.lst
--- docs/menu.lst 26 Feb 2000 08:48:49 - 1.10
+++ docs/menu.lst 30 Mar 2002 23:40:06 -
@@ -11,13 +11,14 @@ default 0
# Fallback to the second entry.
fallback 1
-# For booting the GNU Hurd
+# For booting GNU/Hurd
title GNU/Hurd
root (hd0,0)
-kernel /boot/gnumach.gz root=hd0s1
-module /boot/serverboot.gz
+kernel /boot/gnumach root=device:hd0s1
+module /hurd/ext2fs.static --multiboot-command-line=${kernel-command-line}
+--host-priv-port=${host-port} --device-master-port=${device-port}
+--exec-server-task=${exec-task} -T typed ${root} $(task-create) $(task-resume)
+module /lib/ld.so.1 /hurd/exec $(exec-task=task-create)
-# For booting Linux
+# For booting GNU/Linux
title GNU/Linux
root (hd1,0)
kernel /vmlinuz root=/dev/hdb1
--
Alfred M. Szmidt
___
Bug-grub mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/bug-grub
