[syslinux:elflink] ldlinux: Delete inaccurate 'insufficient memory ' message

syslinux-bot for Matt Fleming matt.fleming at intel.com
Tue Nov 13 11:06:11 PST 2012


Commit-ID:  e5cc8304dc285156051b45ca5d0d03a02810afcd
Gitweb:     http://www.syslinux.org/commit/e5cc8304dc285156051b45ca5d0d03a02810afcd
Author:     Matt Fleming <matt.fleming at intel.com>
AuthorDate: Tue, 13 Nov 2012 15:57:01 +0000
Committer:  Matt Fleming <matt.fleming at intel.com>
CommitDate: Tue, 13 Nov 2012 18:14:50 +0000

ldlinux: Delete inaccurate 'insufficient memory' message

Instead, use strerror() to print a more useful message if we fail to
load a kernel.

Signed-off-by: Matt Fleming <matt.fleming at intel.com>

---
 com32/elflink/ldlinux/kernel.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/com32/elflink/ldlinux/kernel.c b/com32/elflink/ldlinux/kernel.c
index b8f9cb8..c406434 100644
--- a/com32/elflink/ldlinux/kernel.c
+++ b/com32/elflink/ldlinux/kernel.c
@@ -90,7 +90,7 @@ int new_linux_kernel(char *okernel, char *ocmdline)
 	if (loadfile(kernel_name, &kernel_data, &kernel_len)) {
 		if (opt_quiet)
 			printf("Loading %s ", kernel_name);
-		printf("failed!\n");
+		printf("failed: ");
 		goto bail;
 	}
 
@@ -121,7 +121,7 @@ int new_linux_kernel(char *okernel, char *ocmdline)
 		    if (initramfs_load_archive(initramfs, initrd_name)) {
 			if (opt_quiet)
 			    printf("Loading %s ", initrd_name);
-			printf("failed!\n");
+			printf("failed: ");
 			goto bail;
 		    }
 
@@ -132,8 +132,9 @@ int new_linux_kernel(char *okernel, char *ocmdline)
 
 	/* This should not return... */
 	syslinux_boot_linux(kernel_data, kernel_len, initramfs, NULL, cmdline);
+	printf("Booting kernel failed: ");
 
 bail:
-	printf("Kernel load failure (insufficient memory?)\n");
+	printf("%s\n", strerror(errno));
 	return 1;
 }


More information about the Syslinux-commits mailing list