src/patches/grub-0.97/grub-path-cfg.diff

   1 diff -ru ../grub-0.97-save/docs/grub.8 ./docs/grub.8
   2 --- ../grub-0.97-save/docs/grub.8       2005-05-08 04:48:56.000000000 +0200
   3 +++ ./docs/grub.8       2006-09-18 21:26:18.800377712 +0200
   4 @@ -15,7 +15,7 @@
   5  specify stage2 boot_drive [default=0x0]
   6  .TP
   7  \fB\-\-config\-file\fR=\fIFILE\fR
   8 -specify stage2 config_file [default=/boot/grub/menu.lst]
   9 +specify stage2 config_file [default=/boot/grub/grub.conf]
  10  .TP
  11  \fB\-\-device\-map\fR=\fIFILE\fR
  12  use the device map file FILE
  13 diff -ru ../grub-0.97-save/docs/grub.texi ./docs/grub.texi
  14 --- ../grub-0.97-save/docs/grub.texi    2006-09-16 21:29:53.000000000 +0200
  15 +++ ./docs/grub.texi    2006-09-18 21:29:54.573575200 +0200
  16 @@ -687,7 +687,7 @@
  17  For booting from a CD-ROM, GRUB uses a special Stage 2 called
  18  @file{stage2_eltorito}. The only GRUB files you need to have in your
  19  bootable CD-ROM are this @file{stage2_eltorito} and optionally a config file
  20 -@file{menu.lst}. You don't need to use @file{stage1} or @file{stage2},
  21 +@file{grub.conf}. You don't need to use @file{stage1} or @file{stage2},
  22  because El Torito is quite different from the standard boot process.
  23
  24  Here is an example of procedures to make a bootable CD-ROM
  25 @@ -710,7 +710,7 @@
  26  $ @kbd{cp /usr/share/grub/i386-pc/stage2_eltorito iso/boot/grub}
  27  @end example
  28
  29 -If desired, make the config file @file{menu.lst} under @file{iso/boot/grub}
  30 +If desired, make the config file @file{grub.conf} under @file{iso/boot/grub}
  31  (@pxref{Configuration}), and copy any files and directories for the disc to the
  32  directory @file{iso/}.
  33
  34 @@ -1265,7 +1265,7 @@
  35  keys) that will do everything to boot an OS.
  36
  37  To enable the menu, you need a configuration file,
  38 -@file{menu.lst} under the boot directory. We'll analyze an example
  39 +@file{grub.conf} under the boot directory. We'll analyze an example
  40  file.
  41
  42  The file first contains some general settings, the menu interface
  43 @@ -1538,7 +1538,7 @@
  44  foo:ht=1:ha=63655d0334a7:ip=145.71.35.127:\
  45          :bf=/nbgrub:\
  46          :tc=.allhost:\
  47 -        :T150="(nd)/tftpboot/menu.lst.foo":
  48 +        :T150="(nd)/tftpboot/grub.conf.foo":
  49  @end group
  50  @end example
  51
  52 @@ -1882,8 +1882,8 @@
  53
  54  An absolute file name resembles a Unix absolute file name, using
  55  @samp{/} for the directory separator (not @samp{\} as in DOS). One
  56 -example is @samp{(hd0,0)/boot/grub/menu.lst}. This means the file
  57 -@file{/boot/grub/menu.lst} in the first partition of the first hard
  58 +example is @samp{(hd0,0)/boot/grub/grub.conf}. This means the file
  59 +@file{/boot/grub/grub.conf} in the first partition of the first hard
  60  disk. If you omit the device name in an absolute file name, GRUB uses
  61  GRUB's @dfn{root device} implicitly. So if you set the root device to,
  62  say, @samp{(hd1,0)} by the command @command{root} (@pxref{root}), then
  63 @@ -3559,7 +3559,7 @@
  64
  65  @item --config-file=@var{file}
  66  Read the configuration file @var{file} instead of
  67 -@file{/boot/grub/menu.lst}. The format is the same as the normal GRUB
  68 +@file{/boot/grub/grub.conf}. The format is the same as the normal GRUB
  69  syntax. See @ref{Filesystem}, for more information.
  70
  71  @item --boot-drive=@var{drive}
  72 diff -ru ../grub-0.97-save/grub/asmstub.c ./grub/asmstub.c
  73 --- ../grub-0.97-save/grub/asmstub.c    2006-09-16 21:29:52.000000000 +0200
  74 +++ ./grub/asmstub.c    2006-09-18 21:31:08.793292088 +0200
  75 @@ -73,7 +73,7 @@
  76  unsigned long boot_drive = 0;
  77  int saved_entryno = 0;
  78  char version_string[] = VERSION;
  79 -char config_file[128] = "/boot/grub/menu.lst"; /* FIXME: arbitrary */
  80 +char config_file[128] = "/boot/grub/grub.conf"; /* FIXME: arbitrary */
  81  unsigned long linux_text_len = 0;
  82  char *linux_data_tmp_addr = 0;
  83  char *linux_data_real_addr = 0;
  84 diff -ru ../grub-0.97-save/stage1/Makefile.am ./stage1/Makefile.am
  85 --- ../grub-0.97-save/stage1/Makefile.am        2006-09-16 21:29:52.000000000 +0200
  86 +++ ./stage1/Makefile.am        2006-09-18 21:09:46.550222664 +0200
  87 @@ -1,4 +1,4 @@
  88 -pkglibdir = /usr/lib/grub
  89 +pkglibdir = /usr/share/grub/i386-pc
  90  nodist_pkglib_DATA = stage1
  91
  92  CLEANFILES = $(nodist_pkglib_DATA)
  93 #diff -ru ../grub-0.97-save/stage1/Makefile.in ./stage1/Makefile.in
  94 #--- ../grub-0.97-save/stage1/Makefile.in       2006-09-16 21:30:10.000000000 +0200
  95 #+++ ./stage1/Makefile.in       2006-09-18 21:10:36.337653824 +0200
  96 #@@ -66,7 +66,7 @@
  97 # ETAGS = etags
  98 # CTAGS = ctags
  99 # DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 100 #-pkglibdir = /usr/lib/grub
 101 #+pkglibdir = /usr/share/grub/i386-pc
 102 # ACLOCAL = @ACLOCAL@
 103 # AMDEP_FALSE = @AMDEP_FALSE@
 104 # AMDEP_TRUE = @AMDEP_TRUE@
 105 diff -ru ../grub-0.97-save/stage2/Makefile.am ./stage2/Makefile.am
 106 --- ../grub-0.97-save/stage2/Makefile.am        2006-09-16 21:29:52.000000000 +0200
 107 +++ ./stage2/Makefile.am        2006-09-18 21:11:46.148041032 +0200
 108 @@ -27,7 +27,7 @@
 109         -DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1
 110
 111  # Stage 2 and Stage 1.5's.
 112 -pkglibdir = /usr/lib/grub
 113 +pkglibdir = /usr/share/grub/i386-pc
 114
 115  EXTRA_PROGRAMS = nbloader.exec pxeloader.exec diskless.exec
 116
 117 #diff -ru ../grub-0.97-save/stage2/Makefile.in ./stage2/Makefile.in
 118 #--- ../grub-0.97-save/stage2/Makefile.in       2006-09-16 21:30:12.000000000 +0200
 119 #+++ ./stage2/Makefile.in       2006-09-18 21:12:09.087553696 +0200
 120 #@@ -442,7 +442,7 @@
 121 # DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 122 #
 123 # # Stage 2 and Stage 1.5's.
 124 #-pkglibdir = /usr/lib/grub
 125 #+pkglibdir = /usr/share/grub/i386-pc
 126 # ACLOCAL = @ACLOCAL@
 127 # AMDEP_FALSE = @AMDEP_FALSE@
 128 # AMDEP_TRUE = @AMDEP_TRUE@
 129 diff -ru ../grub-0.97-save/stage2/asm.S ./stage2/asm.S
 130 --- ../grub-0.97-save/stage2/asm.S      2006-09-16 21:29:52.000000000 +0200
 131 +++ ./stage2/asm.S      2006-09-18 21:31:53.404510152 +0200
 132 @@ -98,7 +98,7 @@
 133         .string VERSION
 134  VARIABLE(config_file)
 135  #ifndef STAGE1_5
 136 -       .string "/boot/grub/menu.lst"
 137 +       .string "/boot/grub/grub.conf"
 138  #else   /* STAGE1_5 */
 139         .long   0xffffffff
 140         .string "/boot/grub/stage2"
 141 diff -ru ../grub-0.97-save/stage2/builtins.c ./stage2/builtins.c
 142 --- ../grub-0.97-save/stage2/builtins.c 2006-09-16 21:29:52.000000000 +0200
 143 +++ ./stage2/builtins.c 2006-09-18 21:32:39.562493072 +0200
 144 @@ -4022,7 +4022,7 @@
 145
 146    /* The prefix was determined.  */
 147    grub_sprintf (stage2, "%s%s", prefix, "/stage2");
 148 -  grub_sprintf (config_filename, "%s%s", prefix, "/menu.lst");
 149 +  grub_sprintf (config_filename, "%s%s", prefix, "/grub.conf");
 150    *real_config_filename = 0;
 151
 152    /* Check if stage2 exists.  */