Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 85779 | Differences between
and this patch

Collapse All | Expand All

(-)grub-0.96.splash/docs/grub.texi (-4 / +4 lines)
Lines 479-491 Link Here
479
if, by any chance, your hard drive becomes unusable (unbootable).
479
if, by any chance, your hard drive becomes unusable (unbootable).
480
480
481
GRUB comes with boot images, which are normally put in the directory
481
GRUB comes with boot images, which are normally put in the directory
482
@file{/usr/lib/grub/i386-pc}. If you do not use grub-install, then
482
@file{/usr/lib/grub}. If you do not use grub-install, then
483
you need to copy the files @file{stage1}, @file{stage2}, and
483
you need to copy the files @file{stage1}, @file{stage2}, and
484
@file{*stage1_5} to the directory @file{/boot/grub}, and run the
484
@file{*stage1_5} to the directory @file{/boot/grub}, and run the
485
@command{grub-set-default} (@pxref{Invoking grub-set-default}) if you
485
@command{grub-set-default} (@pxref{Invoking grub-set-default}) if you
486
intend to use @samp{default saved} (@pxref{default}) in your
486
intend to use @samp{default saved} (@pxref{default}) in your
487
configuration file. Hereafter, the directory where GRUB images are
487
configuration file. Hereafter, the directory where GRUB images are
488
initially placed (normally @file{/usr/lib/grub/i386-pc}) will be
488
initially placed (normally @file{/usr/lib/grub}) will be
489
called the @dfn{image directory}, and the directory where the boot
489
called the @dfn{image directory}, and the directory where the boot
490
loader needs to find them (usually @file{/boot/grub}) will be called
490
loader needs to find them (usually @file{/boot/grub}) will be called
491
the @dfn{boot directory}.
491
the @dfn{boot directory}.
Lines 513-519 Link Here
513
513
514
@example
514
@example
515
@group
515
@group
516
# @kbd{cd /usr/lib/grub/i386-pc}
516
# @kbd{cd /usr/lib/grub}
517
# @kbd{dd if=stage1 of=/dev/fd0 bs=512 count=1}
517
# @kbd{dd if=stage1 of=/dev/fd0 bs=512 count=1}
518
1+0 records in
518
1+0 records in
519
1+0 records out
519
1+0 records out
Lines 707-713 Link Here
707
Copy the file @file{stage2_eltorito}:
707
Copy the file @file{stage2_eltorito}:
708
708
709
@example
709
@example
710
$ @kbd{cp /usr/lib/grub/i386-pc/stage2_eltorito iso/boot/grub}
710
$ @kbd{cp /usr/lib/grub/stage2_eltorito iso/boot/grub}
711
@end example
711
@end example
712
712
713
If desired, make the config file @file{menu.lst} under @file{iso/boot/grub}
713
If desired, make the config file @file{menu.lst} under @file{iso/boot/grub}
(-)grub-0.96.splash/Makefile.am (+1 lines)
Lines 2-4 Link Here
2
AUTOMAKE_OPTIONS = 1.7 gnu
2
AUTOMAKE_OPTIONS = 1.7 gnu
3
SUBDIRS = netboot stage2 stage1 lib grub util docs
3
SUBDIRS = netboot stage2 stage1 lib grub util docs
4
EXTRA_DIST = BUGS MAINTENANCE
4
EXTRA_DIST = BUGS MAINTENANCE
5
pkgdatadir=$(datadir)
(-)grub-0.96.splash/stage1/Makefile.am (-1 / +1 lines)
Lines 1-4 Link Here
1
pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
1
pkglibdir = /usr/lib/grub
2
nodist_pkglib_DATA = stage1
2
nodist_pkglib_DATA = stage1
3
3
4
CLEANFILES = $(nodist_pkglib_DATA)
4
CLEANFILES = $(nodist_pkglib_DATA)
(-)grub-0.96.splash/stage2/Makefile.am (-1 / +1 lines)
Lines 27-33 Link Here
27
	-DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1
27
	-DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1
28
28
29
# Stage 2 and Stage 1.5's.
29
# Stage 2 and Stage 1.5's.
30
pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)
30
pkglibdir = /usr/lib/grub
31
31
32
EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec
32
EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec
33
33
(-)grub-0.96.splash/util/grub-install.in (-1 / +1 lines)
Lines 27-33 Link Here
27
host_cpu=@host_cpu@
27
host_cpu=@host_cpu@
28
host_os=@host_os@
28
host_os=@host_os@
29
host_vendor=@host_vendor@
29
host_vendor=@host_vendor@
30
pkglibdir=${libdir}/${PACKAGE}/${host_cpu}-${host_vendor}
30
pkglibdir=/usr/lib/grub
31
31
32
grub_shell=${sbindir}/grub
32
grub_shell=${sbindir}/grub
33
grub_set_default=${sbindir}/grub-set-default
33
grub_set_default=${sbindir}/grub-set-default

Return to bug 85779