Bladeren bron

rewrote init.lua to be a real init daemon

master
XeonSquared 1 maand geleden
bovenliggende
commit
6ad6880a6d
3 gewijzigde bestanden met toevoegingen van 24 en 14 verwijderingen
  1. +3
    -1
      build.sh
  2. +1
    -3
      default-init.txt
  3. +20
    -10
      exec/init.lua

+ 3
- 1
build.sh Bestand weergeven

@@ -1,9 +1,11 @@
#!/bin/sh
rm -r target/*
mkdir target
mkdir target &>/dev/null
mkdir target/cfg
lua luapreproc.lua module/init.lua target/init.lua
echo _OSVERSION=\"PsychOS 2.0a1-$(git rev-parse --short HEAD)\" > target/version.lua
cat target/version.lua target/init.lua > target/tinit.lua
mv target/tinit.lua target/init.lua
cp -r exec/ service/ lib/ target/
cp default-init.txt target/cfg/
lua finddesc.lua $(find module/ -type f) $(find lib/ -type f) > apidoc.md

+ 1
- 3
default-init.txt Bestand weergeven

@@ -1,3 +1 @@
minitel.lua
tape-iofs.lua
fsmanager.service
getty.lua

+ 20
- 10
exec/init.lua Bestand weergeven

@@ -1,16 +1,26 @@
xpcall(function()
if os.taskInfo(1) then
return false, "init already started"
end
os.setenv("PWD","/boot")
os.spawnfile("/boot/service/getty.lua")
coroutine.yield()
for k,v in pairs(fs.list("/dev/")) do
if v:sub(1,3) == "tty" then
dprint(tostring(io.input("/dev/"..v)))
dprint(tostring(io.output("/dev/"..v)))
print(_OSVERSION.." - "..tostring(math.floor(computer.totalMemory()/1024)).."K RAM")
os.spawnfile("/boot/exec/shell.lua")
io.input("/dev/null")
io.output("/dev/syslog")
local pids = {}
local function loadlist()
local f = io.open("/boot/cfg/init.txt","rb")
if not f then return false end
for line in f:read("*a"):gmatch("[^\r\n]+") do
dprint(line)
pids[line] = -1
end
f:close()
end
loadlist()
while true do
for k,v in pairs(pids) do
if not os.taskInfo(v) then
dprint("Starting service "..k)
pids[k] = os.spawnfile("/boot/service/"..k)
end
end
coroutine.yield()
end
end,function(e) dprint(e) end,"init")

Laden…
Annuleren
Opslaan