Tweak the output one more time again. The kernel or module pathname

is useful, and usually fits all on one line with the load sizes.

2 files changed, 6 insertions, 5 deletions

diff --git a/sys/boot/common/boot.c b/sys/boot/common/boot.c
index 0a1e624..608c9d0 100644
--- a/sys/boot/common/boot.c
+++ b/sys/boot/common/boot.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: boot.c,v 1.5 1998/10/07 02:38:26 msmith Exp $
+ *	$Id: boot.c,v 1.6 1998/10/11 10:10:41 peter Exp $
  */
 
 /*
@@ -200,8 +200,6 @@ autoboot(int delay, char *prompt)
 	ntime = time(NULL);
 	if (ntime >= when) {
 	    yes = 1;
-	    if (cr)
-		putchar('\n');
 	    break;
 	}
 	if (ntime != otime) {
@@ -210,6 +208,8 @@ autoboot(int delay, char *prompt)
 	    cr = 1;
 	}
     }
+    if (cr)
+	putchar('\n');
     if (yes) {
 	argv[0] = "boot";
 	argv[1] = NULL;
diff --git a/sys/boot/common/load_elf.c b/sys/boot/common/load_elf.c
index 1170d97..e2a3d4e 100644
--- a/sys/boot/common/load_elf.c
+++ b/sys/boot/common/load_elf.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: load_elf.c,v 1.4 1998/10/12 09:13:50 peter Exp $
+ *	$Id: load_elf.c,v 1.5 1998/10/13 09:25:27 peter Exp $
  */
 
 #include <sys/param.h>
@@ -155,10 +155,11 @@ elf_loadmodule(char *filename, vm_offset_t dest, struct loaded_module **result)
 	mp->m_name = strdup(filename);
     mp->m_type = strdup(kernel ? elf_kerneltype : elf_moduletype);
 
-
 #ifdef ELF_VERBOSE
     if (kernel)
 	printf("%s entry at %p\n", filename, (void *) dest);
+#else
+    printf("%s ", filename);
 #endif
 
     mp->m_size = elf_loadimage(mp, fd, dest, &ehdr, kernel);