diff options
| -rw-r--r-- | sysutils/grub/MESSAGE | 9 | ||||
| -rw-r--r-- | sysutils/grub/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/grub/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/grub/patches/patch-ah | 24 |
4 files changed, 36 insertions, 4 deletions
diff --git a/sysutils/grub/MESSAGE b/sysutils/grub/MESSAGE index b230b78c098..f386aeb95f3 100644 --- a/sysutils/grub/MESSAGE +++ b/sysutils/grub/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.5 2005/02/19 10:23:13 wiz Exp $ +$NetBSD: MESSAGE,v 1.6 2006/12/17 19:21:42 jmmv Exp $ If your root filesystem is of a type not supported directly by grub (e.g., lfs), you may have difficulties. See the info docs for more @@ -17,4 +17,11 @@ To boot NetBSD, put something similar to these lines into /grub/menu.lst: root (hd0,0,a) # NetBSD on 1st MBR partition of 1st IDE disk chainloader +1 +Alternatively, for NetBSD 4.x kernels and above, you can use the following +provided that your kernel was built with "options MULTIBOOT" (the default): + + title NetBSD + root (hd0,0,a) # NetBSD on 1st MBR partition of 1st IDE disk + kernel /netbsd + =========================================================================== diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile index 533e7ab5bf8..c8a9f0cfe6f 100644 --- a/sysutils/grub/Makefile +++ b/sysutils/grub/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.45 2006/10/17 21:55:33 bad Exp $ +# $NetBSD: Makefile,v 1.46 2006/12/17 19:21:42 jmmv Exp $ # DISTNAME= grub-0.97 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= sysutils MASTER_SITES= ftp://alpha.gnu.org/gnu/grub/ diff --git a/sysutils/grub/distinfo b/sysutils/grub/distinfo index 35368d61a6c..6bcb2298afd 100644 --- a/sysutils/grub/distinfo +++ b/sysutils/grub/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.20 2006/10/17 21:55:33 bad Exp $ +$NetBSD: distinfo,v 1.21 2006/12/17 19:21:43 jmmv Exp $ SHA1 (grub-0.97.tar.gz) = 2580626c4579bd99336d3af4482c346c95dac4fb RMD160 (grub-0.97.tar.gz) = 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 @@ -10,5 +10,6 @@ SHA1 (patch-ad) = 613e915a015ad22c9bd5712d416e12b1b81fdb93 SHA1 (patch-ae) = 96d8283e90ceb3e887ba0ada05619858c52bc144 SHA1 (patch-af) = 9447ead52940203c998afb67e38ae3d3d26097f8 SHA1 (patch-ag) = 1dd709652d457ba03dda47b64d22cd9320f81e26 +SHA1 (patch-ah) = ff62b64177a0e68400c32e013cb585526db94217 SHA1 (patch-ai) = 60088cf6786a364da37e19fbb5df4c6fd7641016 SHA1 (patch-aj) = bfbac23a7c250ed615dcfb4a988708c970b617d8 diff --git a/sysutils/grub/patches/patch-ah b/sysutils/grub/patches/patch-ah new file mode 100644 index 00000000000..c1ad779977e --- /dev/null +++ b/sysutils/grub/patches/patch-ah @@ -0,0 +1,24 @@ +$NetBSD: patch-ah,v 1.4 2006/12/17 19:21:43 jmmv Exp $ + +--- docs/grub.info.orig 2005-05-08 05:00:05.000000000 +0200 ++++ docs/grub.info +@@ -881,10 +881,18 @@ GRUB can load NetBSD a.out and ELF direc + + 2. Load the kernel with `kernel' (*note kernel::). You should append + the ugly option `--type=netbsd', if you want to load an ELF +- kernel, like this: ++ kernel that corresponds to NetBSD 3.x, previous versions or a ++ recent kernel built without Multiboot support: + + grub> kernel --type=netbsd /netbsd-elf + ++ Alternatively, if you want to load a Multiboot-enabled kernel, the ++ default in NetBSD 4.x and above, use the following: ++ ++ grub> kernel /netbsd-multiboot ++ ++ This is the recommended method if available. ++ + 3. Run `boot' (*note boot::). + + For now, however, GRUB doesn't allow you to pass kernel parameters, |