From 07f1a2818dfddce62c5be35440674ce554cc8f4e Mon Sep 17 00:00:00 2001
From: okuji <okuji@localhost>
Date: Thu, 1 Jun 2000 06:26:52 +0000
Subject: [PATCH] fix a bug in setup, show network configuration in the
 command-line interface.

---
 ChangeLog         | 15 +++++++++++++++
 docs/grub.8       |  2 +-
 stage2/builtins.c |  2 +-
 stage2/cmdline.c  | 10 +++++++++-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eef141bea..5489d6ee3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* acinclude.m4 (grub_ASM_ABSOLUTE_WITHOUT_ASTERISK): New
diff --git a/docs/grub.8 b/docs/grub.8
index 63f6b2f0b..796026765 100644
--- a/docs/grub.8
+++ b/docs/grub.8
@@ -1,5 +1,5 @@
 .\" 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
 GRUB \- the grub shell
 .SH SYNOPSIS
diff --git a/stage2/builtins.c b/stage2/builtins.c
index 062989360..8dbe2e725 100644
--- a/stage2/builtins.c
+++ b/stage2/builtins.c
@@ -2738,7 +2738,7 @@ setup_func (char *arg, int flags)
   
   /* If the drive where stage2 resides is a hard disk, try to use a
      Stage 1.5.  */
-  if (image_drive & 0x80)
+  if ((image_drive & 0x80) && (install_drive & 0x80))
     {
       char *fsys = fsys_table[fsys_type].name;
       int i;
diff --git a/stage2/cmdline.c b/stage2/cmdline.c
index 25a8dd577..7bb6b11d7 100644
--- a/stage2/cmdline.c
+++ b/stage2/cmdline.c
@@ -19,7 +19,11 @@
  *  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
    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.  */
   init_cmdline ();
   init_page ();
+#ifdef SUPPORT_DISKLESS
+  print_network_configuration ();
+  grub_putchar ('\n');
+#endif
   print_cmdline_message (forever);
 
   while (1)