diff options
| author | peter <peter@FreeBSD.org> | 1998-10-14 00:41:17 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1998-10-14 00:41:17 +0000 |
| commit | b059e72205b0bc884e0ae5f4ffdf095d461891c9 (patch) | |
| tree | 9be684a139565f9868f396eb7348cb53091a02f4 /sys | |
| parent | e4f3dfea8d6008af45c71caf6d44d7ff4f99d888 (diff) | |
| download | FreeBSD-src-b059e72205b0bc884e0ae5f4ffdf095d461891c9.zip FreeBSD-src-b059e72205b0bc884e0ae5f4ffdf095d461891c9.tar.gz | |
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.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/boot/common/boot.c | 6 | ||||
| -rw-r--r-- | sys/boot/common/load_elf.c | 5 |
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); |
