aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-11-13 15:57:01 +0000
committerMatt Fleming <matt.fleming@intel.com>2012-11-13 18:14:50 +0000
commite5cc8304dc285156051b45ca5d0d03a02810afcd (patch)
treecee89dbb7bcb1f1f84de5be9237bbf46301046aa
parent4dec62ce9c2c0d170f21b3ae2d7c618eb7a30c05 (diff)
downloadsyslinux-e5cc8304dc285156051b45ca5d0d03a02810afcd.tar.gz
syslinux-e5cc8304dc285156051b45ca5d0d03a02810afcd.tar.xz
syslinux-e5cc8304dc285156051b45ca5d0d03a02810afcd.zip
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@intel.com>
-rw-r--r--com32/elflink/ldlinux/kernel.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/com32/elflink/ldlinux/kernel.c b/com32/elflink/ldlinux/kernel.c
index b8f9cb8d..c4064345 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;
}