From cce84dc5c5ad44a0afce30571fb0d99a7f7029de Mon Sep 17 00:00:00 2001 From: XeonSquared Date: Wed, 13 Sep 2017 12:52:03 +1000 Subject: [PATCH] convert luash to a fwrappable program --- configs/everything.cfg | 2 +- configs/headless.cfg | 2 +- configs/minimal.cfg | 2 +- {modules/applications => exec}/luash.lua | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) rename {modules/applications => exec}/luash.lua (97%) diff --git a/configs/everything.cfg b/configs/everything.cfg index d2a469a..5508bc7 100755 --- a/configs/everything.cfg +++ b/configs/everything.cfg @@ -19,8 +19,8 @@ modules/lib/sha256.lua modules/lib/userlib.lua modules/net/net-ext.lua modules/applications/login.lua -modules/applications/luash.lua modules/applications/genkernel.lua +fwrap luash exec/luash.lua fwrap skex exec/skex2.lua fwrap nshd exec/nshd.lua fwrap nsh exec/nsh.lua diff --git a/configs/headless.cfg b/configs/headless.cfg index 4c80910..6c40f8b 100755 --- a/configs/headless.cfg +++ b/configs/headless.cfg @@ -17,7 +17,7 @@ modules/lib/sha256.lua modules/lib/userlib.lua modules/net/net-ext.lua modules/applications/login.lua -modules/applications/luash.lua +fwrap luash exec/luash.lua modules/applications/genkernel.lua fwrap skex exec/skex2.lua fwrap nshd exec/nshd.lua diff --git a/configs/minimal.cfg b/configs/minimal.cfg index 31fceca..45b8743 100755 --- a/configs/minimal.cfg +++ b/configs/minimal.cfg @@ -19,7 +19,7 @@ modules/lib/sha256.lua modules/lib/userlib.lua modules/net/net-ext.lua modules/applications/login.lua -modules/applications/luash.lua +fwrap luash exec/luash.lua modules/applications/genkernel.lua modules/util/fs-automount.lua modules/setup.lua diff --git a/modules/applications/luash.lua b/exec/luash.lua similarity index 97% rename from modules/applications/luash.lua rename to exec/luash.lua index f051c19..71d3380 100644 --- a/modules/applications/luash.lua +++ b/exec/luash.lua @@ -1,4 +1,5 @@ -function luash(si) +local tA = {...} +local si = spawn("lua shell",function() coroutine.yield() log(login()) @@ -45,4 +46,3 @@ spawn("lua shell",function() end end end,{sI=si}) -end