1.2-dev merge #5
No files matched your search
@@ -120,7 +120,7 @@ end
|
|||||||
|
|
||||||
local initCfgFunc, err = load(ifs.readAllText("/boot/boot.cfg"), "@boot.cfg")
|
local initCfgFunc, err = load(ifs.readAllText("/boot/boot.cfg"), "@boot.cfg")
|
||||||
if not initCfgFunc then
|
if not initCfgFunc then
|
||||||
kernel.LOG_Text("Failed to load /boot/boot.cfg: "..tostring(err))
|
kernel.PANIC("Failed to load /boot/boot.cfg: "..tostring(err))
|
||||||
end
|
end
|
||||||
|
|
||||||
---@diagnostic disable-next-line: param-type-mismatch
|
---@diagnostic disable-next-line: param-type-mismatch
|
||||||
|
|||||||
@@ -97,6 +97,7 @@ if kernel.firstBoot then
|
|||||||
{"tmp", REG, 0, 0, RWXRWXRWX},
|
{"tmp", REG, 0, 0, RWXRWXRWX},
|
||||||
{"usr", REG, 0, 0, RWX_RX_RX},
|
{"usr", REG, 0, 0, RWX_RX_RX},
|
||||||
{"var", REG, 0, 0, RWX_RX_RX},
|
{"var", REG, 0, 0, RWX_RX_RX},
|
||||||
|
{"opt", REG, 0, 0, RWXRWXRWX},
|
||||||
})
|
})
|
||||||
|
|
||||||
mergeMeta("/bin", {
|
mergeMeta("/bin", {
|
||||||
|
|||||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -288,9 +288,9 @@ local function getUserInput(prompt, history)
|
|||||||
syscall.devctl(1,"spos",ox,oy)
|
syscall.devctl(1,"spos",ox,oy)
|
||||||
w(input .. " \n")
|
w(input .. " \n")
|
||||||
return input
|
return input
|
||||||
else
|
elseif #key == 1 and key:byte(1) >= 32 and key:byte(1) < 127 then
|
||||||
input = input:sub(1, cursor-1) .. key .. input:sub(cursor)
|
input=string.sub(input,1,cursor-1)..key..string.sub(input,cursor)
|
||||||
cursor = cursor + 1; dirty = true
|
cursor=cursor+1;dirty=true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
local nb = (math.floor(syscall.getUptime() / 500) % 2) == 0
|
local nb = (math.floor(syscall.getUptime() / 500) % 2) == 0
|
||||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -41,6 +41,6 @@ for i,v in ipairs(files) do
|
|||||||
end
|
end
|
||||||
|
|
||||||
while true do
|
while true do
|
||||||
sleep(1)
|
sleep(5)
|
||||||
kernel.saveLog()
|
kernel.saveLog()
|
||||||
end
|
end
|
||||||
File renamed without changes.
File renamed without changes.
+12
-12
@@ -11,7 +11,7 @@ syscall.sethomedir=function(uid, homedir) end
|
|||||||
|
|
||||||
--- Reads amount from fd and returns content or nil
|
--- Reads amount from fd and returns content or nil
|
||||||
--- @param fd integer
|
--- @param fd integer
|
||||||
--- @param amount integer
|
--- @param amount? integer
|
||||||
--- @return string|nil
|
--- @return string|nil
|
||||||
syscall.read=function(fd, amount) end
|
syscall.read=function(fd, amount) end
|
||||||
|
|
||||||
@@ -115,7 +115,7 @@ syscall.umount=function(target) end
|
|||||||
--- @return integer[]
|
--- @return integer[]
|
||||||
syscall.getTasks=function() end
|
syscall.getTasks=function() end
|
||||||
|
|
||||||
--- Dump system state for debugging
|
--- Dump all syscalls for debugging
|
||||||
--- @return table
|
--- @return table
|
||||||
syscall.sysdump=function() end
|
syscall.sysdump=function() end
|
||||||
|
|
||||||
@@ -235,16 +235,16 @@ syscall.setuid=function(uid) end
|
|||||||
|
|
||||||
--- Replace current task with executable
|
--- Replace current task with executable
|
||||||
--- @param path string
|
--- @param path string
|
||||||
--- @param args table
|
--- @param args? table
|
||||||
--- @param envars table
|
--- @param envars? table
|
||||||
syscall.exec=function(path, args, envars) end
|
syscall.exec=function(path, args, envars) end
|
||||||
|
|
||||||
--- Spawn a new task from executable
|
--- Spawn a new task from executable
|
||||||
--- @param path string
|
--- @param path string
|
||||||
--- @param name string
|
--- @param name? string
|
||||||
--- @param envars table
|
--- @param envars? table
|
||||||
--- @param args table
|
--- @param args? table
|
||||||
--- @param tgid integer
|
--- @param tgid? integer
|
||||||
--- @return integer
|
--- @return integer
|
||||||
syscall.execspawn=function(path, name, envars, args, tgid) end
|
syscall.execspawn=function(path, name, envars, args, tgid) end
|
||||||
|
|
||||||
@@ -268,10 +268,10 @@ syscall.newuser=function(username, password, gid, homedir, shell) end
|
|||||||
|
|
||||||
--- Spawn a new task from function
|
--- Spawn a new task from function
|
||||||
--- @param func function
|
--- @param func function
|
||||||
--- @param name string
|
--- @param name? string
|
||||||
--- @param envars table
|
--- @param envars? table
|
||||||
--- @param args table
|
--- @param args? table
|
||||||
--- @param tgid integer
|
--- @param tgid? integer
|
||||||
--- @return integer
|
--- @return integer
|
||||||
syscall.spawn=function(func, name, envars, args, tgid) end
|
syscall.spawn=function(func, name, envars, args, tgid) end
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user