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

fix a bug in setup, show network configuration in the command-line interface.

Browse source
This commit is contained in:
okuji 2000-06-01 06:26:52 +00:00
parent bec90507d7
commit 07f1a2818d
4 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -1,3 +1,18 @@
2000-06-01 OKUJI Yoshinori <okuji@gnu.org>
From Chip Salzenberg:
* stage2/cmdline.c (enter_cmdline) [SUPPORT_DISKLESS]: Redisplay
network configuration after clearing screen, before first prompt.
* stage2/cmdline.c: Include <shared.h> instead of "shared.h".
[SUPPORT_DISKLESS]: Include <etherboot.h>.
2000-06-01 OKUJI Yoshinori <okuji@gnu.org>
* stage2/builtins.c (setup_func): Try to install a Stage 1.5,
check if INSTALL_DRIVE is a hard disk as well as IMAGE_DRIVE.
Reported by Pavel Roskin.
2000-05-31 OKUJI Yoshinori <okuji@gnu.org> 2000-05-31 OKUJI Yoshinori <okuji@gnu.org>
* acinclude.m4 (grub_ASM_ABSOLUTE_WITHOUT_ASTERISK): New * acinclude.m4 (grub_ASM_ABSOLUTE_WITHOUT_ASTERISK): New

2
docs/grub.8
View file

@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.020. .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.020.
.TH GRUB "8" "May 2000" "GNU GRUB 0.5.95" FSF .TH GRUB "8" "June 2000" "GNU GRUB 0.5.95" FSF
.SH NAME .SH NAME
GRUB \- the grub shell GRUB \- the grub shell
.SH SYNOPSIS .SH SYNOPSIS

2
stage2/builtins.c
View file

@ -2738,7 +2738,7 @@ setup_func (char *arg, int flags)
/* If the drive where stage2 resides is a hard disk, try to use a /* If the drive where stage2 resides is a hard disk, try to use a
Stage 1.5. */ Stage 1.5. */
if (image_drive & 0x80) if ((image_drive & 0x80) && (install_drive & 0x80))
{ {
char *fsys = fsys_table[fsys_type].name; char *fsys = fsys_table[fsys_type].name;
int i; int i;

10
stage2/cmdline.c
View file

@ -19,7 +19,11 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#include "shared.h" #include <shared.h>
#ifdef SUPPORT_DISKLESS
# include <etherboot.h>
#endif
/* Find the next word from CMDLINE and return the pointer. If /* Find the next word from CMDLINE and return the pointer. If
AFTER_EQUAL is non-zero, assume that the character `=' is treated as AFTER_EQUAL is non-zero, assume that the character `=' is treated as
@ -117,6 +121,10 @@ enter_cmdline (char *heap, int forever)
/* Initialize the data and print a message. */ /* Initialize the data and print a message. */
init_cmdline (); init_cmdline ();
init_page (); init_page ();
#ifdef SUPPORT_DISKLESS
print_network_configuration ();
grub_putchar ('\n');
#endif
print_cmdline_message (forever); print_cmdline_message (forever);
while (1) while (1)