Module Name: src
Committed By: dsl
Date: Wed Nov 18 21:02:16 UTC 2009
Modified Files:
src/sys/arch/i386/stand/bootxx: boot1.c
src/sys/arch/i386/stand/bootxx/bootxx_ustarfs: Makefile
Log Message:
Reinstate the 'banner'.
It is a useful diagnostic that the boot sequence is proceeding.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/i386/stand/bootxx/boot1.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/arch/i386/stand/bootxx/bootxx_ustarfs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/stand/bootxx/boot1.c
diff -u src/sys/arch/i386/stand/bootxx/boot1.c:1.17 src/sys/arch/i386/stand/bootxx/boot1.c:1.18
--- src/sys/arch/i386/stand/bootxx/boot1.c:1.17 Wed Apr 30 16:18:26 2008
+++ src/sys/arch/i386/stand/bootxx/boot1.c Wed Nov 18 21:02:16 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: boot1.c,v 1.17 2008/04/30 16:18:26 ad Exp $ */
+/* $NetBSD: boot1.c,v 1.18 2009/11/18 21:02:16 dsl Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: boot1.c,v 1.17 2008/04/30 16:18:26 ad Exp $");
+__RCSID("$NetBSD: boot1.c,v 1.18 2009/11/18 21:02:16 dsl Exp $");
#include <lib/libsa/stand.h>
#include <lib/libkern/libkern.h>
@@ -62,15 +62,13 @@
const char *
boot1(uint32_t biosdev, uint32_t *sector)
{
- struct stat sb;
+ struct stat sb;
int fd;
bios_sector = *sector;
d.dev = biosdev;
-#ifdef SHOW_BANNER
- putstr("\r\nNetBSD/x86 " STR(FS) " Primary Bootstrap\r\n");
-#endif
+ putstr("\r\nNetBSD/x86 " STR(FS) " Primary Bootstrap\r\n");
if (set_geometry(&d, NULL))
return "set_geometry\r\n";
Index: src/sys/arch/i386/stand/bootxx/bootxx_ustarfs/Makefile
diff -u src/sys/arch/i386/stand/bootxx/bootxx_ustarfs/Makefile:1.2 src/sys/arch/i386/stand/bootxx/bootxx_ustarfs/Makefile:1.3
--- src/sys/arch/i386/stand/bootxx/bootxx_ustarfs/Makefile:1.2 Wed Apr 30 16:18:26 2008
+++ src/sys/arch/i386/stand/bootxx/bootxx_ustarfs/Makefile Wed Nov 18 21:02:16 2009
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2008/04/30 16:18:26 ad Exp $
+# $NetBSD: Makefile,v 1.3 2009/11/18 21:02:16 dsl Exp $
FS=ustarfs
BOOTXX_SECTORS=16
-CPPFLAGS+= -DSHOW_BANNER
.include <../Makefile.bootxx>
