vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* stage2/builtins.c (setup_func): When invoking install with an

Browse source 
embedded stage1_5 give the path to menu.lst as real_config_file.
This commit is contained in:
jochen 2000-10-24 14:57:24 +00:00
parent e7a1ff1759
commit 33c3b18d40
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2000-10-24 Jochen Hoenicke <jochen@gnu.org>
* stage2/builtins.c (setup_func): When invoking install with an
embedded stage1_5 give the path to menu.lst as real_config_file.
2000-10-23 OKUJI Yoshinori <okuji@gnu.org> 2000-10-23 OKUJI Yoshinori <okuji@gnu.org>
* docs/multiboot.texi: Upgraded to 0.6.92. * docs/multiboot.texi: Upgraded to 0.6.92.

13
stage2/builtins.c
View file

@ -3513,6 +3513,7 @@ setup_func (char *arg, int flags)
char stage1[64]; char stage1[64];
char stage2[64]; char stage2[64];
char config_filename[64]; char config_filename[64];
char real_config_filename[64];
char cmd_arg[256]; char cmd_arg[256];
char device[16]; char device[16];
char *buffer = (char *) RAW_ADDR (0x100000); char *buffer = (char *) RAW_ADDR (0x100000);
@ -3663,6 +3664,7 @@ setup_func (char *arg, int flags)
/* The prefix was determined. */ /* The prefix was determined. */
grub_sprintf (stage2, "%s%s", prefix, "/stage2"); grub_sprintf (stage2, "%s%s", prefix, "/stage2");
grub_sprintf (config_filename, "%s%s", prefix, "/menu.lst"); grub_sprintf (config_filename, "%s%s", prefix, "/menu.lst");
*real_config_filename = 0;
/* Check if stage2 exists. */ /* Check if stage2 exists. */
if (! check_file (stage2)) if (! check_file (stage2))
@ -3690,6 +3692,7 @@ setup_func (char *arg, int flags)
int blocksize = (filemax + SECTOR_SIZE - 1) >> SECTOR_BITS; int blocksize = (filemax + SECTOR_SIZE - 1) >> SECTOR_BITS;
grub_close (); grub_close ();
grub_strcpy (real_config_filename, config_filename);
grub_strcpy (config_filename, stage2); grub_strcpy (config_filename, stage2);
grub_strcpy (stage2, stage1_5); grub_strcpy (stage2, stage1_5);
@ -3740,7 +3743,7 @@ setup_func (char *arg, int flags)
#ifdef NO_BUGGY_BIOS_IN_THE_WORLD #ifdef NO_BUGGY_BIOS_IN_THE_WORLD
/* I prefer this, but... */ /* I prefer this, but... */
grub_sprintf (cmd_arg, "%s%s%s%s %s%s %s p %s", grub_sprintf (cmd_arg, "%s%s%s%s %s%s %s p %s %s",
is_force_lba? "--force-lba" : "", is_force_lba? "--force-lba" : "",
stage2_arg? stage2_arg : "", stage2_arg? stage2_arg : "",
stage2_arg? " " : "", stage2_arg? " " : "",
@ -3748,20 +3751,22 @@ setup_func (char *arg, int flags)
(installed_drive != image_drive) ? "d " : "", (installed_drive != image_drive) ? "d " : "",
device, device,
stage2, stage2,
config_filename); config_filename,
real_config_filename);
#else /* ! NO_BUGGY_BIOS_IN_THE_WORLD */ #else /* ! NO_BUGGY_BIOS_IN_THE_WORLD */
/* Actually, there are several buggy BIOSes in the world, so we /* Actually, there are several buggy BIOSes in the world, so we
may not expect that your BIOS will pass a booting drive to stage1 may not expect that your BIOS will pass a booting drive to stage1
correctly. Thus, always specify the option `d', whether correctly. Thus, always specify the option `d', whether
INSTALLED_DRIVE is identical with IMAGE_DRIVE or not. *sigh* */ INSTALLED_DRIVE is identical with IMAGE_DRIVE or not. *sigh* */
grub_sprintf (cmd_arg, "%s%s%s%s d %s %s p %s", grub_sprintf (cmd_arg, "%s%s%s%s d %s %s p %s %s",
is_force_lba? "--force-lba " : "", is_force_lba? "--force-lba " : "",
stage2_arg? stage2_arg : "", stage2_arg? stage2_arg : "",
stage2_arg? " " : "", stage2_arg? " " : "",
stage1, stage1,
device, device,
stage2, stage2,
config_filename); config_filename,
real_config_filename);
#endif /* ! NO_BUGGY_BIOS_IN_THE_WORLD */ #endif /* ! NO_BUGGY_BIOS_IN_THE_WORLD */
/* Notify what will be run. */ /* Notify what will be run. */