From: Michael Brown <mcb30@ipxe.org>
Date: Wed, 2 Mar 2011 19:39:39 +0000 (+0000)
Subject: [autoboot] Tidy up output following NBP execution
X-Git-Tag: v1.20.1~2288
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a61e37e2e75df46714e02b6cfb3a7838d9d41e3;p=thirdparty%2Fipxe.git

[autoboot] Tidy up output following NBP execution

If the NBP returns, then always print a trailing newline, since some
NBPs (e.g. wdsnbp.com) leave the cursor in a random position halfway
across the screen.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
---

diff --git a/src/usr/autoboot.c b/src/usr/autoboot.c
index 0fe00b360..c743404c0 100644
--- a/src/usr/autoboot.c
+++ b/src/usr/autoboot.c
@@ -175,8 +175,14 @@ int uriboot ( struct uri *filename, struct uri *root_path ) {
 	if ( filename ) {
 		if ( ( rc = imgdownload ( image, filename,
 					  register_and_autoexec_image ) ) !=0){
-			printf ( "Could not chain image: %s\n",
+			printf ( "\nCould not chain image: %s\n",
 				 strerror ( rc ) );
+		} else {
+			/* Always print an extra newline, because we
+			 * don't know where the NBP may have left the
+			 * cursor.
+			 */
+			printf ( "\n" );
 		}
 	} else if ( root_path ) {
 		if ( fetch_intz_setting ( NULL, &skip_san_boot_setting) == 0 ) {