src/patches/grub-0.97/grub-0.97-configfile.patch

   1 diff -ru grub-0.97-old/docs/grub.8 grub-0.97/docs/grub.8
   2 --- grub-0.97-old/docs/grub.8   2005-05-08 02:48:56.000000000 +0000
   3 +++ grub-0.97/docs/grub.8       2006-08-05 13:17:07.868362408 +0000
   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-old/docs/grub.texi grub-0.97/docs/grub.texi
  14 --- grub-0.97-old/docs/grub.texi        2005-05-08 02:59:59.000000000 +0000
  15 +++ grub-0.97/docs/grub.texi    2006-08-05 13:17:07.875361344 +0000
  16 @@ -1265,7 +1265,7 @@
  17  keys) that will do everything to boot an OS.
  18
  19  To enable the menu, you need a configuration file,
  20 -@file{menu.lst} under the boot directory. We'll analyze an example
  21 +@file{grub.conf} under the boot directory. We'll analyze an example
  22  file.
  23
  24  The file first contains some general settings, the menu interface
  25 @@ -1882,8 +1882,8 @@
  26
  27  An absolute file name resembles a Unix absolute file name, using
  28  @samp{/} for the directory separator (not @samp{\} as in DOS). One
  29 -example is @samp{(hd0,0)/boot/grub/menu.lst}. This means the file
  30 -@file{/boot/grub/menu.lst} in the first partition of the first hard
  31 +example is @samp{(hd0,0)/boot/grub/grub.conf}. This means the file
  32 +@file{/boot/grub/grub.conf} in the first partition of the first hard
  33  disk. If you omit the device name in an absolute file name, GRUB uses
  34  GRUB's @dfn{root device} implicitly. So if you set the root device to,
  35  say, @samp{(hd1,0)} by the command @command{root} (@pxref{root}), then
  36 @@ -3542,7 +3542,7 @@
  37
  38  @item --config-file=@var{file}
  39  Read the configuration file @var{file} instead of
  40 -@file{/boot/grub/menu.lst}. The format is the same as the normal GRUB
  41 +@file{/boot/grub/grub.conf}. The format is the same as the normal GRUB
  42  syntax. See @ref{Filesystem}, for more information.
  43
  44  @item --boot-drive=@var{drive}
  45 diff -ru grub-0.97-old/grub/asmstub.c grub-0.97/grub/asmstub.c
  46 --- grub-0.97-old/grub/asmstub.c        2005-02-16 20:45:14.000000000 +0000
  47 +++ grub-0.97/grub/asmstub.c    2006-08-05 13:17:07.866362712 +0000
  48 @@ -71,7 +71,7 @@
  49  unsigned long boot_drive = 0;
  50  int saved_entryno = 0;
  51  char version_string[] = VERSION;
  52 -char config_file[128] = "/boot/grub/menu.lst"; /* FIXME: arbitrary */
  53 +char config_file[128] = "/boot/grub/grub.conf"; /* FIXME: arbitrary */
  54  unsigned long linux_text_len = 0;
  55  char *linux_data_tmp_addr = 0;
  56  char *linux_data_real_addr = 0;
  57 diff -ru grub-0.97-old/stage2/asm.S grub-0.97/stage2/asm.S
  58 --- grub-0.97-old/stage2/asm.S  2004-06-19 16:55:22.000000000 +0000
  59 +++ grub-0.97/stage2/asm.S      2006-08-05 13:17:07.859363776 +0000
  60 @@ -98,7 +98,7 @@
  61         .string VERSION
  62  VARIABLE(config_file)
  63  #ifndef STAGE1_5
  64 -       .string "/boot/grub/menu.lst"
  65 +       .string "/boot/grub/grub.conf"
  66  #else   /* STAGE1_5 */
  67         .long   0xffffffff
  68         .string "/boot/grub/stage2"
  69 diff -ru grub-0.97-old/stage2/builtins.c grub-0.97/stage2/builtins.c
  70 --- grub-0.97-old/stage2/builtins.c     2005-02-15 21:58:23.000000000 +0000
  71 +++ grub-0.97/stage2/builtins.c 2006-08-05 13:17:07.864363016 +0000
  72 @@ -3973,7 +3973,7 @@
  73
  74    /* The prefix was determined.  */
  75    grub_sprintf (stage2, "%s%s", prefix, "/stage2");
  76 -  grub_sprintf (config_filename, "%s%s", prefix, "/menu.lst");
  77 +  grub_sprintf (config_filename, "%s%s", prefix, "/grub.conf");
  78    *real_config_filename = 0;
  79
  80    /* Check if stage2 exists.  */