From 83038ffbbc7e8c7c3ab854cc7c9f29b5d8c1dc02 Mon Sep 17 00:00:00 2001
From: okuji <okuji@localhost>
Date: Sun, 28 May 2000 14:30:48 +0000
Subject: [PATCH] fix some bugs in netboot. now the diskless support is
 working.

---
 ChangeLog         | 11 +++++++++++
 stage2/asm.S      |  2 +-
 stage2/common.c   |  2 +-
 stage2/nbloader.S |  4 ++--
 stage2/shared.h   |  4 ++--
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5d5b96c79..c0f23b0e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2000-05-28  OKUJI Yoshinori  <okuji@gnu.org>
+
+	* stage2/asm.S (codestart): Fix a typo: DISKLESS_SUPPORT ->
+	SUPPORT_DISKLESS.
+	* stage2/nbloader.S: Fix the image length and the memory length
+	fields. They shouldn't contain the first sector for a tag.
+	Mmh..., that is unclear as far as I see the Net Boot Image
+	Proposal...
+	* stage2/shared.h (STACKOFF): Enclosed with parentheses.
+	(PROTSTACKINIT): Likewise.
+	
 2000-05-27  OKUJI Yoshinori  <okuji@gnu.org>
 
 	Add diskless support, mostly based on patches by Christoph
diff --git a/stage2/asm.S b/stage2/asm.S
index 31f352f94..f95408ec9 100644
--- a/stage2/asm.S
+++ b/stage2/asm.S
@@ -107,7 +107,7 @@ codestart:
 
 	sti		/* we're safe again */
 
-#ifndef DISKLESS_SUPPORT
+#ifndef SUPPORT_DISKLESS
 	/* save boot drive reference */
 	ADDR32	movb	%dl, EXT_C(boot_drive)
 #endif
diff --git a/stage2/common.c b/stage2/common.c
index 007d1989c..cbf1b8822 100644
--- a/stage2/common.c
+++ b/stage2/common.c
@@ -268,7 +268,7 @@ init_bios_info (void)
   if (! setup_diskless_environment ())
     return;
 #endif
-  
+
   /* Set boot drive and partition.  */
   saved_drive = boot_drive;
   saved_partition = install_partition;
diff --git a/stage2/nbloader.S b/stage2/nbloader.S
index 1095b926b..9f3b74a94 100644
--- a/stage2/nbloader.S
+++ b/stage2/nbloader.S
@@ -41,8 +41,8 @@
 
 	.long	0x04000004
 	.long	NBI_DEST_ADDR + 0x0200
-	.long	DISKLESS_SIZE + 0x200
-	.long	DISKLESS_SIZE + 0x200
+	.long	DISKLESS_SIZE
+	.long	DISKLESS_SIZE
 
 	/* This ensures that the length of this image will be 1 sector */
 	. = _start + 0x200 - 1
diff --git a/stage2/shared.h b/stage2/shared.h
index 4279825d2..31a40053b 100644
--- a/stage2/shared.h
+++ b/stage2/shared.h
@@ -234,8 +234,8 @@ extern char *grub_scratch_mem;
 #define PROT_MODE_DSEG  0x10
 #define PSEUDO_RM_CSEG	0x18
 #define PSEUDO_RM_DSEG	0x20
-#define STACKOFF	0x2000 - 0x10
-#define PROTSTACKINIT   FSYS_BUF - 0x10
+#define STACKOFF	(0x2000 - 0x10)
+#define PROTSTACKINIT   (FSYS_BUF - 0x10)
 
 
 /*