aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2014-03-13 13:15:57 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2014-03-13 13:15:57 -0700
commit25310cb3f9655e6bd61397144e1bf58bda6a1cf5 (patch)
tree25e5d2094d286a58c9b8288f84e2df484c1882b7
parent01394840d20d90eb307649f7dfa9fb347be39339 (diff)
downloadsyslinux-obsolete-20140313.tar.gz
syslinux-obsolete-20140313.tar.xz
syslinux-obsolete-20140313.zip
lua: Remove obsolete crap from sl_boot_linux()obsolete-20140313
sl_boot_linux() contained a bunch of random obsolete garbage. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-rw-r--r--com32/lua/src/syslinux.c29
1 files changed, 0 insertions, 29 deletions
diff --git a/com32/lua/src/syslinux.c b/com32/lua/src/syslinux.c
index 440ec872..0fb933d0 100644
--- a/com32/lua/src/syslinux.c
+++ b/com32/lua/src/syslinux.c
@@ -188,7 +188,6 @@ static int sl_boot_linux(lua_State * L)
char *newcmdline;
uint32_t mem_limit = luaL_optint(L, 3, 0);
uint16_t video_mode = luaL_optint(L, 4, 0);
-// int ret, i;
int ret;
char **argv, **argp, *arg, *p;
@@ -224,23 +223,6 @@ static int sl_boot_linux(lua_State * L)
if ((arg = find_argument(argp, "mem=")))
mem_limit = saturate32(suffix_number(arg));
- if ((arg = find_argument(argp, "vga="))) {
- switch (arg[0] | 0x20) {
- case 'a': /* "ask" */
- video_mode = 0xfffd;
- break;
- case 'e': /* "ext" */
- video_mode = 0xfffe;
- break;
- case 'n': /* "normal" */
- video_mode = 0xffff;
- break;
- default:
- video_mode = strtoul(arg, NULL, 0);
- break;
- }
- }
-
printf("Loading kernel %s...\n", kernel);
if (loadfile(kernel, &kernel_data, &kernel_len))
printf("failed!\n");
@@ -269,17 +251,6 @@ static int sl_boot_linux(lua_State * L)
} while ((arg = p));
}
- if (!loadfile("/testfile1", &file_data, &file_len)) {
- if (initramfs_add_file(initramfs, file_data, file_len, file_len,
- "/testfile1", 0, 0755))
- printf("Adding extra file failed\n");
- } else
- printf("Loading extra file failed\n");
-
- /* DEBUG
- msleep(10000);
- */
-
ret = syslinux_boot_linux(kernel_data, kernel_len, initramfs, NULL, newcmdline);
printf("syslinux_boot_linux returned %d\n", ret);