summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-05-13 04:59:32 +0000
committerMike Frysinger <vapier@gentoo.org>2006-05-13 04:59:32 +0000
commitfb4a1866dd8e1a4d52adfda3ad93c084d21cb797 (patch)
tree8ba9bbc5e796f7545fed68c616007306b43cbf4c /sys-boot
parentsourceforge cvs location change - bug #133081 refers. (diff)
downloadgentoo-2-fb4a1866dd8e1a4d52adfda3ad93c084d21cb797.tar.gz
gentoo-2-fb4a1866dd8e1a4d52adfda3ad93c084d21cb797.tar.bz2
gentoo-2-fb4a1866dd8e1a4d52adfda3ad93c084d21cb797.zip
Add a pkg_config() foby Petteri Räty for users to configure other devices #133129.
(Portage version: 2.1_pre10-r5)
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/grub/ChangeLog6
-rw-r--r--sys-boot/grub/grub-0.97-r2.ebuild45
2 files changed, 38 insertions, 13 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 0fd19b39d944..dc1bc913bf78 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-boot/grub
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.61 2006/04/27 22:44:26 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.62 2006/05/13 04:59:32 vapier Exp $
+
+ 13 May 2006; Mike Frysinger <vapier@gentoo.org> grub-0.97-r2.ebuild:
+ Add a pkg_config() foby Petteri Räty for users to configure other devices
+ #133129.
27 Apr 2006; Alec Warner <antarus@gentoo.org> files/digest-grub-0.92-r1,
files/digest-grub-0.94-r1, files/digest-grub-0.96-r1, Manifest:
diff --git a/sys-boot/grub/grub-0.97-r2.ebuild b/sys-boot/grub/grub-0.97-r2.ebuild
index 2c9c23e88895..799760c2b487 100644
--- a/sys-boot/grub/grub-0.97-r2.ebuild
+++ b/sys-boot/grub/grub-0.97-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r2.ebuild,v 1.5 2006/03/22 03:40:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r2.ebuild,v 1.6 2006/05/13 04:59:32 vapier Exp $
inherit mount-boot eutils flag-o-matic toolchain-funcs
@@ -120,30 +120,51 @@ src_install() {
newdoc docs/menu.lst grub.conf.sample
}
-pkg_postinst() {
- [[ ${ROOT} != "/" ]] && return 0
+setup_boot_dir() {
+ local dir="${1}"
+
+ [[ ! -e "${dir}" ]] && die "${dir} does not exist!"
+
+ [[ ! -e "${dir}/grub" ]] && mkdir "${dir}/grub"
# change menu.lst to grub.conf
- if [[ ! -e /boot/grub/grub.conf && -e /boot/grub/menu.lst ]] ; then
- mv -f /boot/grub/menu.lst /boot/grub/grub.conf
+ if [[ ! -e "${dir}/grub/grub.conf" && -e "${dir}/grub/menu.lst" ]] ; then
+ mv -f "${dir}/grub/menu.lst ${dir}/grub/grub.conf"
ewarn
ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
ewarn
fi
+
+ if [[ ! -e "${dir}"/grub/menu.lst ]]; then
einfo "Linking from new grub.conf name to menu.lst"
- [[ ! -e /boot/grub/menu.lst ]] && ln -snf grub.conf /boot/grub/menu.lst
+ ln -snf grub.conf "${dir}/grub/menu.lst"
+ fi
- [[ -e /boot/grub/stage2 ]] && mv /boot/grub/stage2{,.old}
+ [[ -e "${dir}"/grub/stage2 ]] && mv "${dir}"/grub/stage2{,.old}
- einfo "Copying files from /lib/grub and /usr/lib/grub to /boot"
+ einfo "Copying files from /lib/grub and /usr/lib/grub to "${dir}""
for x in /lib*/grub/*/* /usr/lib*/grub/*/* ; do
- [[ -f ${x} ]] && cp -p ${x} /boot/grub/
+ [[ -f ${x} ]] && cp -p ${x} "${dir}"/grub/
done
- if [[ -e /boot/grub/grub.conf ]] ; then
- egrep -v '^[[:space:]]*(#|$|default|fallback|splashimage|timeout|title)' /boot/grub/grub.conf | \
+ if [[ -e "${dir}"/grub/grub.conf ]] ; then
+ egrep -v '^[[:space:]]*(#|$|default|fallback|splashimage|timeout|title)' "${dir}"/grub/grub.conf | \
/sbin/grub --batch \
- --device-map=/boot/grub/device.map \
+ --device-map="${dir}"/grub/device.map \
> /dev/null
fi
}
+
+pkg_postinst() {
+ [[ ${ROOT} != "/" ]] && return 0
+ setup_boot_dir /boot
+ einfo "To install grub files to another device (like a usb stick), just run:"
+ einfo " emerge --config =${PF}"
+}
+
+pkg_config() {
+ local dir
+ einfo "Enter the directory where you want to setup grub:"
+ read dir
+ setup_boot_dir ${dir}
+}