summaryrefslogtreecommitdiff
path: root/sys/arch/amd64
diff options
context:
space:
mode:
authorTom Cosgrove <tom@cvs.openbsd.org>2004-02-21 00:49:00 +0000
committerTom Cosgrove <tom@cvs.openbsd.org>2004-02-21 00:49:00 +0000
commit8ce35c12c95264f26e4301ee86e2a21e6a25397f (patch)
treec9461c3e6efc10822dd918fa61fa6ba5ce735f4d /sys/arch/amd64
parentddb6b73bdad86651566ce262f892d0a70dfe3d51 (diff)
Tidy up installboot -v output.
requested by and ok deraadt@
Diffstat (limited to 'sys/arch/amd64')
-rw-r--r--sys/arch/amd64/stand/installboot/installboot.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/sys/arch/amd64/stand/installboot/installboot.c b/sys/arch/amd64/stand/installboot/installboot.c
index f834d769143..75dff1929d7 100644
--- a/sys/arch/amd64/stand/installboot/installboot.c
+++ b/sys/arch/amd64/stand/installboot/installboot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: installboot.c,v 1.1 2004/02/03 12:09:47 mickey Exp $ */
+/* $OpenBSD: installboot.c,v 1.2 2004/02/21 00:48:59 tom Exp $ */
/* $NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */
/*
@@ -423,9 +423,6 @@ getbootparams(char *boot, int devfd, struct disklabel *dl)
ndb = howmany(ip->di_size, fs->fs_bsize);
if (ndb <= 0)
errx(1, "No blocks to load");
- if (verbose)
- fprintf(stderr, "%s is %d blocks x %d bytes\n",
- boot, ndb, fs->fs_bsize);
/*
* Now set the values that will need to go into biosboot
@@ -442,6 +439,16 @@ getbootparams(char *boot, int devfd, struct disklabel *dl)
((((char *)ap) - buf) + INODEOFF));
sym_set_value(pbr_symbols, "_nblocks", ndb);
+ if (verbose) {
+ fprintf(stderr, "%s is %d blocks x %d bytes\n",
+ boot, ndb, fs->fs_bsize);
+ fprintf(stderr, "fs block shift %u; part offset %u; "
+ "inode block %u, offset %u\n",
+ fs->fs_fsbtodb, pl->p_offset,
+ ino_to_fsba(fs, statbuf.st_ino),
+ (unsigned int)((((char *)ap) - buf) + INODEOFF));
+ }
+
return 0;
}
@@ -528,8 +535,10 @@ pbr_set_symbols(char *fname, char *proto, struct sym_data *sym_list)
free(nl);
+#if 0
if (verbose)
fprintf(stderr, "%s = %u\n",
sym->sym_name, sym->sym_value);
+#endif
}
}