[syslinux] [PATCH][git-pull] lua: make kernel and initrd progress output match in sl_boot_linux

[Ferenc Wagner]

Hi,

Any word on this request?  I'm planning to add error handling (as
bailing out after printing "failed") to sl_boot_linux().  Shall I build
on this patch, or shall I squash them together?

Thanks,
Feri.

Ferenc Wagner <wferi at niif.hu> writes:

> The following changes since commit 81609df52ac52636a6d4af9249ede641620cb3a7:
>
>   Centralize shift_is_held(), make it work to force the command line (2014-04-20 11:46:59 -0700)
>
> are available in the git repository at:
>
>   https://github.com/wferi/syslinux progress
>
> for you to fetch changes up to 5b19c094527fde3694afab1f878c2877973f5044:
>
>   lua: make kernel and initrd progress output match in sl_boot_linux (2014-04-29 14:56:47 +0200)
>
> ----------------------------------------------------------------
> Ferenc Wágner (1):
>       lua: make kernel and initrd progress output match in sl_boot_linux
>
>  com32/lua/src/syslinux.c |    8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/com32/lua/src/syslinux.c b/com32/lua/src/syslinux.c
> index ea702fa..5e57db0 100644
> --- a/com32/lua/src/syslinux.c
> +++ b/com32/lua/src/syslinux.c
> @@ -219,7 +219,7 @@ static int sl_boot_linux(lua_State * L)
>         msleep(1000);
>       */
>  
> -    printf("Loading kernel %s...\n", kernel);
> +    printf("Loading kernel %s... ", kernel);
>      if (loadfile(kernel, &kernel_data, &kernel_len))
>  	printf("failed!\n");
>      else
> @@ -237,10 +237,10 @@ static int sl_boot_linux(lua_State * L)
>  
>  	    initrd = arg;
>  	    printf("Loading initrd %s... ", initrd);
> -	    if (initramfs_load_archive(initramfs, initrd)) {
> +	    if (initramfs_load_archive(initramfs, initrd))
>  		printf("failed!\n");
> -	    }
> -	    printf("ok\n");
> +	    else
> +		printf("ok\n");
>  
>  	    if (p)
>  		*p++ = ',';
>
> _______________________________________________
> Syslinux mailing list
> Submissions to Syslinux at zytor.com
> Unsubscribe or set options at:
> http://www.zytor.com/mailman/listinfo/syslinux