Compare commits
2 Commits
a97e3c93ee
...
256e05233a
Author | SHA1 | Date | |
---|---|---|---|
256e05233a | |||
a219b5603e |
@ -1 +1,2 @@
|
|||||||
getty.lua
|
getty.lua
|
||||||
|
fsmanager.lua
|
||||||
|
@ -97,12 +97,16 @@ function fs.rename(from,to) -- moves file *from* to *to*
|
|||||||
end
|
end
|
||||||
|
|
||||||
function fs.mount(path,proxy) -- mounts the filesystem *proxy* to the mount point *path* if it is a directory. BYO proxy.
|
function fs.mount(path,proxy) -- mounts the filesystem *proxy* to the mount point *path* if it is a directory. BYO proxy.
|
||||||
if fs.isDirectory(path) then
|
if fs.isDirectory(path) and not fsmounts[table.concat(fs.segments(path),"/")] then
|
||||||
fsmounts[table.concat(fs.segments(path),"/")] = proxy
|
fsmounts[table.concat(fs.segments(path),"/")] = proxy
|
||||||
return true
|
return true
|
||||||
end
|
end
|
||||||
return false, "path is not a directory"
|
return false, "path is not a directory"
|
||||||
end
|
end
|
||||||
|
function fs.umount(path)
|
||||||
|
local fsi,_ = fs.resolve(path)
|
||||||
|
fsmounts[fsi] = nil
|
||||||
|
end
|
||||||
|
|
||||||
function fs.mounts() -- returns a table containing the mount points of all mounted filesystems
|
function fs.mounts() -- returns a table containing the mount points of all mounted filesystems
|
||||||
local rt = {}
|
local rt = {}
|
||||||
@ -127,9 +131,5 @@ if computer.getBootAddress then
|
|||||||
fs.makeDirectory("boot")
|
fs.makeDirectory("boot")
|
||||||
fs.mount("boot",component.proxy(computer.getBootAddress()))
|
fs.mount("boot",component.proxy(computer.getBootAddress()))
|
||||||
end
|
end
|
||||||
for addr, _ in component.list("filesystem") do
|
|
||||||
fs.makeDirectory(addr:sub(1,3))
|
|
||||||
fs.mount(addr:sub(1,3),component.proxy(addr))
|
|
||||||
end
|
|
||||||
|
|
||||||
end
|
end
|
||||||
|
@ -1,11 +1,21 @@
|
|||||||
|
local function mount(addr)
|
||||||
|
dest = component.invoke(addr,"getLabel") or "mnt/"..addr:sub(1,3)
|
||||||
|
dest = "/"..dest
|
||||||
|
syslog("Mounting "..addr.." to "..dest)
|
||||||
|
fs.makeDirectory(dest)
|
||||||
|
local w,r = fs.mount(dest,component.proxy(addr))
|
||||||
|
if not w then
|
||||||
|
syslog("Failed to mount: "..r)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
for addr, _ in component.list("filesystem") do
|
||||||
|
mount(addr)
|
||||||
|
end
|
||||||
while true do
|
while true do
|
||||||
local tE = {coroutine.yield()}
|
local tE = {coroutine.yield()}
|
||||||
if tE[1] == "component_added" and tE[3] == "filesystem" then
|
if tE[1] == "component_added" and tE[3] == "filesystem" then
|
||||||
local w, doesExist = pcall(fs.exists,"/"..tE[2]:sub(1,3))
|
mount(tE[2])
|
||||||
if not w or not doesExist then
|
|
||||||
fs.mounts[tE[2]:sub(1,3)] = component.proxy(tE[2])
|
|
||||||
end
|
|
||||||
elseif tE[1] == "component_removed" and tE[3] == "filesystem" then
|
elseif tE[1] == "component_removed" and tE[3] == "filesystem" then
|
||||||
fs.mounts[tE[2]:sub(1,3)] = nil
|
fs.umount("/mnt/"..tE[2]:sub(1,3))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user