2002-06-15 Yoshinori K. Okuji <okuji@enbug.org>

	* stage2/disk_io.c [SUPPORT_NETBOOT] (GRUB): Defined.
	[SUPPORT_NETBOOT]: Include etherboot.h.
	[!STAGE1_5] (print_completions) [SUPPORT_NETBOOT]: When
	completing a disk name, if NETWORK_READY is true, add "nd" as a
	completion.

diff --git a/ChangeLog b/ChangeLog
index e0f35f126f59a6face62f14ed91c7a59f6558201..c481b2cf7bce3135958bf84f08c6605eb94c6705 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-06-15  Yoshinori K. Okuji  <okuji@enbug.org>
+
+       * stage2/disk_io.c [SUPPORT_NETBOOT] (GRUB): Defined.
+       [SUPPORT_NETBOOT]: Include etherboot.h.
+       [!STAGE1_5] (print_completions) [SUPPORT_NETBOOT]: When
+       completing a disk name, if NETWORK_READY is true, add "nd" as a
+       completion.
+       
 2002-06-15  Yoshinori K. Okuji  <okuji@enbug.org>
 
        * stage2/fsys_xfs.c (le32): Don't use bswap, but use xchgb and

diff --git a/stage2/disk_io.c b/stage2/disk_io.c
index e65865d87050655c0ab4f8a835c98ad441cce2bc..8fe314f22fb0ffae1ecb65bf6e7ed3fbb27c784c 100644 (file)
--- a/stage2/disk_io.c
+++ b/stage2/disk_io.c
@@ -19,9 +19,13 @@
  */
 
 
-#include "shared.h"
+#include <shared.h>
+#include <filesys.h>
 
-#include "filesys.h"
+#ifdef SUPPORT_NETBOOT
+# define GRUB  1
+# include <etherboot.h>
+#endif
 
 #ifdef GRUB_UTIL
 # include <device.h>
@@ -1310,6 +1314,11 @@ print_completions (int is_filename, int is_completion)
                    }
                }
 
+# ifdef SUPPORT_NETBOOT
+             if (network_ready)
+               print_a_completion ("nd");
+# endif /* SUPPORT_NETBOOT */
+
              if (is_completion && *unique_string)
                {
                  ptr = buf;