summaryrefslogtreecommitdiff
path: root/lua_scripts
diff options
context:
space:
mode:
authorLauri Aarnio <Lauri.Aarnio@iki.fi>2009-01-08 16:20:36 +0200
committerLauri Leukkunen <lle@rahina.org>2009-01-10 01:19:32 +0200
commit689102fb5aa210fe53e886a8bb3deff29e552999 (patch)
tree73ddaaa1272a134d420a692b80a134bfa1642739 /lua_scripts
parent481b566e0ef346411a770baf3c37cec782e2ac2c (diff)
"tools" mode bugfix: Do not map tools_root twice
Diffstat (limited to 'lua_scripts')
-rw-r--r--lua_scripts/pathmaps/tools/00_default.lua8
1 files changed, 8 insertions, 0 deletions
diff --git a/lua_scripts/pathmaps/tools/00_default.lua b/lua_scripts/pathmaps/tools/00_default.lua
index 76ecf18..0617fb1 100644
--- a/lua_scripts/pathmaps/tools/00_default.lua
+++ b/lua_scripts/pathmaps/tools/00_default.lua
@@ -9,6 +9,11 @@
rule_file_interface_version = "18"
----------------------------------
+tools = tools_root
+if (not tools) then
+ tools = "/"
+end
+
-- If the permission token exists and contains "root", tools_root directories
-- will be available in R/W mode. Otherwise it will be "mounted" R/O.
local tools_root_is_readonly
@@ -40,6 +45,9 @@ mapall_chain = {
{path = "/usr/bin/sb2-show", use_orig_path = true,
readonly = true},
+ -- tools_root should not be mapped twice.
+ {prefix = tools, use_orig_path = true, readonly = true},
+
-- ldconfig is static binary, and needs to be wrapped
{prefix = "/sb2/wrappers",
replace_by = session_dir .. "/wrappers." .. active_mapmode,