From f70e5d24091054d18b0bf094a6ca87302f127765 Mon Sep 17 00:00:00 2001 From: okuji Date: Sat, 29 Dec 2001 18:33:39 +0000 Subject: [PATCH] Use /boot/grub in NetBSD. --- ChangeLog | 5 +++++ util/grub-install.in | 16 ++++++++++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 79365ac85..f2626166d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-12-30 Yoshinori K. Okuji + + * util/grub-install.in: Set GRUB_PREFIX and BOOTDIR to "/grub" + and "${rootdir}" respectively in NetBSD. + 2001-12-30 Yoshinori K. Okuji * stage2/builtins.c (builtin_geometry): Add extra space diff --git a/util/grub-install.in b/util/grub-install.in index ab58cc25f..500cfc33e 100644 --- a/util/grub-install.in +++ b/util/grub-install.in @@ -1,7 +1,7 @@ #! /bin/sh # Install GRUB on your drive. -# Copyright (C) 1999, 2000 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001 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 @@ -199,7 +199,19 @@ if test $debug = yes; then fi # Initialize these directories here, since ROOTDIR was initialized. -bootdir=${rootdir}/boot +case "$host_os" in +netbsd*) + # Because /boot is used for the boot block in NetBSD, use /grub + # instead of /boot/grub. + grub_prefix=/grub + bootdir=${rootdir} + ;; +*) + # Use /boot/grub by default. + bootdir=${rootdir}/boot + ;; +esac + grubdir=${bootdir}/grub device_map=${grubdir}/device.map