lib/shutil.lua

@@ -83,7 +83,7 @@ function shutil.df() -- Prints free disk space.
  local fstr = "%-"..tostring(ml).."s %5s %5s"
  print("fs"..(" "):rep(ml-2).."  size  used")
  for k,v in pairs(mt) do
-  local st, su = fs.spaceTotal(v.."/."), fs.spaceUsed(v.."/.")
+  local st, su = fs.spaceTotal(v), fs.spaceUsed(v)
   print(string.format(fstr,v,wrapUnits(st),wrapUnits(su)))
  end
 end

service/fsmanager.lua

@@ -1,36 +1,29 @@
 local fsmanager = {}
-fsmanager.filesystems = {}
-local run = true
 local function mount(addr)
- dest = "/" .. (component.invoke(addr,"getLabel") or "mnt/"..addr:sub(1,3))
+ 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
- fsmanager.filesystems[addr] = dest
 end
 for addr, _ in component.list("filesystem") do
  mount(addr)
 end
 
 function fsmanager.start()
- run = true
  return os.spawn(function()
-  while run do
+  while true do
    local tE = {coroutine.yield()}
    if tE[1] == "component_added" and tE[3] == "filesystem" then
     mount(tE[2])
-   elseif tE[1] == "component_removed" and fsmanager.filesystems[tE[2]] and tE[3] == "filesystem" then
-    syslog("Unmounting "..tE[2].." from "..fsmanager.filesystems[tE[2]])
-    fs.umount(fsmanager.filesystems[tE[2]])
+   elseif tE[1] == "component_removed" and tE[3] == "filesystem" then
+    fs.umount("/mnt/"..tE[2]:sub(1,3))
    end
   end
  end,"fsmanager")
 end
-function fsmanager.stop()
- run = false
-end
 
 return fsmanager