]>
Commit | Line | Data |
---|---|---|
27996c53 MT |
1 | diff -Nur grub-0.97-splash/docs/grub.texi grub-0.97-dirs/docs/grub.texi |
2 | --- grub-0.97-splash/docs/grub.texi 2005-08-21 20:29:22.000000000 +0300 | |
3 | +++ grub-0.97-dirs/docs/grub.texi 2005-08-21 20:31:12.000000000 +0300 | |
4 | @@ -479,13 +479,13 @@ | |
5 | if, by any chance, your hard drive becomes unusable (unbootable). | |
6 | ||
7 | GRUB comes with boot images, which are normally put in the directory | |
8 | -@file{/usr/lib/grub/i386-pc}. If you do not use grub-install, then | |
9 | +@file{/usr/share/grub/i386-pc}. If you do not use grub-install, then | |
10 | you need to copy the files @file{stage1}, @file{stage2}, and | |
11 | @file{*stage1_5} to the directory @file{/boot/grub}, and run the | |
12 | @command{grub-set-default} (@pxref{Invoking grub-set-default}) if you | |
13 | intend to use @samp{default saved} (@pxref{default}) in your | |
14 | configuration file. Hereafter, the directory where GRUB images are | |
15 | -initially placed (normally @file{/usr/lib/grub/i386-pc}) will be | |
16 | +initially placed (normally @file{/usr/share/grub/i386-pc}) will be | |
17 | called the @dfn{image directory}, and the directory where the boot | |
18 | loader needs to find them (usually @file{/boot/grub}) will be called | |
19 | the @dfn{boot directory}. | |
20 | @@ -513,7 +513,7 @@ | |
21 | ||
22 | @example | |
23 | @group | |
24 | -# @kbd{cd /usr/lib/grub/i386-pc} | |
25 | +# @kbd{cd /usr/share/grub/i386-pc} | |
26 | # @kbd{dd if=stage1 of=/dev/fd0 bs=512 count=1} | |
27 | 1+0 records in | |
28 | 1+0 records out | |
29 | @@ -707,7 +707,7 @@ | |
30 | Copy the file @file{stage2_eltorito}: | |
31 | ||
32 | @example | |
33 | -$ @kbd{cp /usr/lib/grub/i386-pc/stage2_eltorito iso/boot/grub} | |
34 | +$ @kbd{cp /usr/share/grub/i386-pc/stage2_eltorito iso/boot/grub} | |
35 | @end example | |
36 | ||
37 | If desired, make the config file @file{menu.lst} under @file{iso/boot/grub} | |
38 | diff -Nur grub-0.97-splash/Makefile.am grub-0.97-dirs/Makefile.am | |
39 | --- grub-0.97-splash/Makefile.am 2005-08-21 20:29:14.000000000 +0300 | |
40 | +++ grub-0.97-dirs/Makefile.am 2005-08-21 20:31:12.000000000 +0300 | |
41 | @@ -2,3 +2,4 @@ | |
42 | AUTOMAKE_OPTIONS = 1.7 gnu | |
43 | SUBDIRS = netboot stage2 stage1 lib grub util docs | |
44 | EXTRA_DIST = BUGS MAINTENANCE | |
45 | +pkgdatadir=$(datadir) | |
46 | diff -Nur grub-0.97-splash/stage1/Makefile.am grub-0.97-dirs/stage1/Makefile.am | |
47 | --- grub-0.97-splash/stage1/Makefile.am 2005-08-21 20:29:14.000000000 +0300 | |
48 | +++ grub-0.97-dirs/stage1/Makefile.am 2005-08-21 20:31:12.000000000 +0300 | |
49 | @@ -1,4 +1,4 @@ | |
50 | -pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) | |
51 | +pkglibdir = /usr/share/grub/i386-pc | |
52 | nodist_pkglib_DATA = stage1 | |
53 | ||
54 | CLEANFILES = $(nodist_pkglib_DATA) | |
55 | diff -Nur grub-0.97-splash/stage2/Makefile.am grub-0.97-dirs/stage2/Makefile.am | |
56 | --- grub-0.97-splash/stage2/Makefile.am 2005-08-21 20:29:14.000000000 +0300 | |
57 | +++ grub-0.97-dirs/stage2/Makefile.am 2005-08-21 20:31:12.000000000 +0300 | |
58 | @@ -27,7 +27,7 @@ | |
59 | -DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1 | |
60 | ||
61 | # Stage 2 and Stage 1.5's. | |
62 | -pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor) | |
63 | +pkglibdir = /usr/share/grub/i386-pc | |
64 | ||
65 | EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec | |
66 | ||
67 | diff -Nur grub-0.97-splash/util/grub-install.in grub-0.97-dirs/util/grub-install.in | |
68 | --- grub-0.97-splash/util/grub-install.in 2005-08-21 20:29:14.000000000 +0300 | |
69 | +++ grub-0.97-dirs/util/grub-install.in 2005-08-21 20:31:12.000000000 +0300 | |
70 | @@ -27,7 +27,7 @@ | |
71 | host_cpu=@host_cpu@ | |
72 | host_os=@host_os@ | |
73 | host_vendor=@host_vendor@ | |
74 | -pkglibdir=${libdir}/${PACKAGE}/${host_cpu}-${host_vendor} | |
75 | +pkglibdir=/usr/share/grub/i386-pc | |
76 | ||
77 | grub_shell=${sbindir}/grub | |
78 | grub_set_default=${sbindir}/grub-set-default |