super dupper system update (it runs)

Test/Hyperion-kernel-v1.0.0/boot/fstab

@@ -1,3 +1,2 @@
-U $;/
-U devfs0000;/dev/
-U sysfs0000;/sys/
+U $;/
+U devfs0000;/dev/

Test/Hyperion-kernel-v1.0.0/boot/initfs

@@ -49,15 +49,23 @@ function fs.remove(path)
 end
 function fs.readAllText(path)
     local disk, newPath = resolve(path)
-    return disk:readAllText(newPath)
+    local handle = disk:open(newPath, "r")
+    if not handle then return nil end
+    local content = handle.readAll()
+    handle.close()
+    return content
 end
 function fs.writeAllText(path, text)
     local disk, newPath = resolve(path)
-    return disk:writeAllText(newPath, text)
+    local handle = disk:open(newPath, "w")
+    handle.write(text)
+    handle.close()
 end
 function fs.appendAllText(path, text)
     local disk, newPath = resolve(path)
-    return disk:appendAllText(newPath, text)
+    local handle = disk:open(newPath, "a")
+    handle.write(text)
+    handle.close()
 end
 function fs.load(path)
     return load(fs.readAllText(path), path)

Test/Hyperion-kernel-v1.0.0/boot/kernel.lua

@@ -2,7 +2,6 @@ local args = {...}
 local apis = args[1]
 local disks = args[2]
 local arch = args[3]
-local initPath = args[4]
 local screen = args[5]
 local computer = args[6]
 local ifs = args[7]
@@ -20,13 +19,20 @@ kernel.cache = {}
 kernel.cache.preload = {}
 kernel._G=_G
 kernel.sleep=sleep
+kernel.debug=true
+
 _G.sleep=nil
 local windowsExp = false
 
 function kernel.log(msg, level)
-    LOG_Text = LOG_Text..tostring(computer.time()).." "..kernel.user.." "..kernel.process.."["..tostring(level or "INFO").."]: "..msg.."\n"
+    LOG_Text = LOG_Text..tostring(computer:time()).." "..kernel.user.." "..kernel.process.."["..tostring(level or "INFO").."]: "..msg.."\n"
     if kernel.status == "start" then
-        screen:print(tostring(computer.time()).." "..kernel.user.." "..kernel.process.."["..tostring(level or "INFO").."]: "..msg)
+        screen:print(tostring(computer:time()).." "..kernel.user.." "..kernel.process.."["..tostring(level or "INFO").."]: "..msg)
+    elseif kernel.status == "init" then
+        kernel.standbyTask=kernel.currentTask
+        kernel.currentTask=kernel.kernelTask
+        kernel.tty.print(tostring(computer:time()).." "..kernel.user.." "..kernel.process.."["..tostring(level or "INFO").."]: "..msg)
+        kernel.currentTask=kernel.standbyTask
     end
 end
 
@@ -76,9 +82,13 @@ kernel.log("Kernel loaded.")
 kernel.log("Mounting init disks...")
 disks.refresh()
 ifs.update(disks)
+kernel.disks={}
+for _,v in disks.list() do
+    kernel.disks[v.address] = v
+end
 ifs.mount("$", "/")
 
-local fstab=ifs.readAllText("/etc/fstab")
+local fstab=ifs.readAllText("/boot/fstab")
 local split = function(str, delim, maxResultCountOrNil)
     assert(#delim == 1, "only delim len 1 supported for now")
     maxResultCountOrNil = (maxResultCountOrNil or 0)-1
@@ -97,6 +107,33 @@ local split = function(str, delim, maxResultCountOrNil)
     return rv
 end
 
+if not ifs.isFile("/boot/boot.cfg") then
+    kernel.log("boot.cfg missing or corrupted!, Attempting to write recovery boot.cfg", "ERROR")
+    ifs.writeAllText("/boot/boot.cfg",[[
+-- DO NOT EDIT THIS FILE IF YOU DO NOT KNOW WHAT YOU ARE DOING!
+-- DOING SO MAY RENDER YOUR SYSTEM UNBOOTABLE!
+
+-- This file is auto-generated during the build process.
+-- RECOVERY BOOT CONFIGURATION FILE
+return {
+    initPath = "/sbin/init.lua",
+    maxOpenFiles = 128,
+    maxFilesPerTask = 16,
+    preempt=true
+}
+]])
+end
+local initCfgFunc, err = load(ifs.readAllText("/boot/boot.cfg"), "@boot.cfg")
+if not initCfgFunc then
+    kernel.PANIC("Failed to load /boot/boot.cfg: "..tostring(err))
+end
+
+local initCfgStatus, config = pcall(initCfgFunc)
+if not initCfgStatus then
+    kernel.PANIC("Error in /boot/boot.cfg: "..tostring(config))
+end
+kernel.config = config
+
 for i,v in ipairs(split(fstab,"\n")) do
     if v:sub(1,1)=="U" then
         local id=""
@@ -131,7 +168,7 @@ function kernel.newFifo()
     return fifo
 end
 
-function kernel.generateUUID()
+function kernel.newUUID()
     local template = "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx"
     local uuid = ""
     for i = 1, #template do
@@ -147,45 +184,67 @@ function kernel.generateUUID()
     return uuid
 end
 
-kernel.syscalls={[0]=0}
-for i=1, 100 do
-    kernel.syscalls[i]=0
-end
-function kernel.registerSyscall(name, func)
-    kernel.syscalls[name]=func
-end
-
+kernel.syscalls={}
 local modules={[0]={}}
 for i=0, 100 do
     modules[i]={}
 end
 
 kernel.log("Gathering modules")
-for i,v in ipairs(ifs.list("/lib/modules/Hyperion/")) do
-    local prior=tonumber(v:sub(1,2))
-    modules[prior+1][#modules[prior+1]+1]="/lib/modules/Hyperion/"..v
+for _, i in ipairs(ifs.list("/lib/modules")) do
+    for _,v in ipairs(ifs.list("/lib/modules/"..i)) do
+        local prior=tonumber(v:sub(1,2))
+        modules[prior+1][#modules[prior+1]+1]="/lib/modules/"..i.."/"..v
+    end
 end
 
 kernel.ifs=ifs
 kernel.apis=apis
 kernel.computer=computer
-kernel.initPath=initPath
 kernel.arch=arch
 kernel.initdisks=disks
 kernel.screen=screen
 kernel.processes={}
+kernel.fstab=fstab
+
+kernel.kernelTask = {
+    name="kernel",
+    status="R",
+    pid=0,
+    tgid=0,
+    user="root",
+    uid=0,
+    fd={},
+    exit="",
+    sleep=0,
+    ivs=0,
+    vs=0,
+    children={},
+    syscallReturn={},
+    cwd="/",
+    timeSlice=0,
+    lastTime=0,
+    totalTime=0,
+    numRuns=0
+}
+kernel.currentTask = kernel.kernelTask
 
 kernel.log("Running modules")
 for _,p in ipairs(modules) do
     for _,v in ipairs(p) do
         local code=ifs.readAllText(v)
+        if not code then 
+            kernel.log("ModuReadErr: "..v, "WARN") 
+            goto skip
+        end
         local func,err=load(code,"@"..v)
-        if not func then kernel.panic("ModuLoadErr: "..tostring(err), "WARN") goto skip end
+        if not func then kernel.panic("ModuLoadErr: "..tostring(err)) goto skip end
         local status, err = xpcall(func,debug.traceback, kernel)
-        if not status then kernel.panic("ModuRunErr: "..tostring(err), "WARN") end
+        if not status then kernel.panic("ModuRunErr: "..tostring(err)) end
         ::skip::
     end
 end
+
 kernel.log("Kernel initialized successfully.")
 kernel.main()
 kernel.PANIC("Execution complete")