[syslinux:master] lua: Remove obsolete crap from sl_boot_linux()

syslinux-bot for H. Peter Anvin hpa at linux.intel.com
Thu Mar 13 13:21:03 PDT 2014


Commit-ID:  687c5c7bb1f9dcc1db21fe8e950f2dc9588f02e6
Gitweb:     http://www.syslinux.org/commit/687c5c7bb1f9dcc1db21fe8e950f2dc9588f02e6
Author:     H. Peter Anvin <hpa at linux.intel.com>
AuthorDate: Thu, 13 Mar 2014 13:15:57 -0700
Committer:  H. Peter Anvin <hpa at linux.intel.com>
CommitDate: Thu, 13 Mar 2014 13:18:17 -0700

lua: Remove obsolete crap from sl_boot_linux()

sl_boot_linux() contained a bunch of random obsolete garbage.

Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>

---
 com32/lua/src/syslinux.c | 29 -----------------------------
 1 file changed, 29 deletions(-)

diff --git a/com32/lua/src/syslinux.c b/com32/lua/src/syslinux.c
index 440ec87..0fb933d 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);


More information about the Syslinux-commits mailing list