Ocawesome101/OC-PsychOS2
1
0
Fork 0
forked from izaya/OC-PsychOS2
Code Issues Pull Requests Releases Wiki Activity

made getty actually start relevant services and re-start on failure

Browse Source
This commit is contained in:
Izaya 2019-11-09 14:23:47 +11:00
parent 6ad6880a6d
commit aed9278433
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
service/getty.lua
View File

@ -1,4 +1,4 @@
local gpus,screens,ttyn = {}, {}, 0 local gpus,screens,ttyn,pids = {}, {}, 0, {}
local function scan() local function scan()
local w,di = pcall(computer.getDeviceInfo) local w,di = pcall(computer.getDeviceInfo)
if w then if w then
@ -29,6 +29,14 @@ local function nextScreen(n)
end end
return rt[n] or rt[8000] or rt[2000] or rt[600] return rt[n] or rt[8000] or rt[2000] or rt[600]
end end
local function spawnShell(fin,fout)
io.input(fin)
io.output(fout)
print(_OSVERSION.." - "..tostring(math.floor(computer.totalMemory()/1024)).."K RAM")
return os.spawnfile("/boot/exec/shell.lua")
end
local function allocate() local function allocate()
for k,v in pairs(gpus) do for k,v in pairs(gpus) do
dprint(k) dprint(k)
@ -38,13 +46,22 @@ local function allocate()
devfs.register("tty"..tostring(ttyn), function() return r,w,function() end end) devfs.register("tty"..tostring(ttyn), function() return r,w,function() end end)
gpus[k][1] = true gpus[k][1] = true
screens[sA][1] = true screens[sA][1] = true
pids["tty"..tostring(ttyn)] = {-1}
ttyn = ttyn + 1 ttyn = ttyn + 1
end end
end end
end end
scan() scan()
allocate() allocate()
dprint("screens ready") dprint("screens ready")
while true do while true do
coroutine.yield() coroutine.yield()
for k,v in pairs(pids) do
if not os.taskInfo(v[1]) then
dprint("Spawning new shell for "..k)
pids[k][1] = spawnShell(v[2] or "/dev/"..k, v[3] or "/dev/"..k)
pids[k][2], pids[k][3] = pids[k][2] or io.input(), pids[k][3] or io.output()
end
end
end end