izaya/OC-KittenOS
1
0
Fork 0
mirror of https://github.com/20kdc/OC-KittenOS.git synced 2024-11-23 19:08:05 +11:00
Code Issues Releases Wiki Activity

Fix service autostart hang if a service was already active

Browse Source
This commit is contained in:
20kdc 2018-04-25 19:52:23 +01:00
parent 0b918437d0
commit bed9f55d70
2 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/apps/sys-icecap.lua
View File

@ -268,8 +268,7 @@ rootAccess.securityPolicy = function (pid, proc, perm, req)
secPolicyStage2(pid, proc, perm, req) secPolicyStage2(pid, proc, perm, req)
end end
-- Do we need to start it? -- Do we need to start it?
if perm:sub(1, 6) == "x.svc." then if perm:sub(1, 6) == "x.svc." and not neo.usAccessExists(perm) then
if not neo.usAccessExists(perm) then
local appAct = perm:sub(7) local appAct = perm:sub(7)
local paP = appAct:match(endAcPattern) local paP = appAct:match(endAcPattern)
if paP then if paP then
@ -296,7 +295,6 @@ rootAccess.securityPolicy = function (pid, proc, perm, req)
end end
table.insert(todo, f) table.insert(todo, f)
return return
end
else else
finish() finish()
end end

4
code/init.lua
View File

@ -335,9 +335,7 @@ baseProcNeo = {
listLibs = lister("libs/"), listLibs = lister("libs/"),
usAccessExists = function (accessName) usAccessExists = function (accessName)
ensureType(accessName, "string") ensureType(accessName, "string")
if accesses[accessName] then return not not accesses[accessName]
return true
end
end, end,
totalIdleTime = function () return idleTime end, totalIdleTime = function () return idleTime end,
ensurePath = ensurePath, ensurePath = ensurePath,