diff options
| author | Mika Westerberg <mika.westerberg@iki.fi> | 2009-03-05 12:26:41 +0200 |
|---|---|---|
| committer | Lauri Leukkunen <lle@rahina.org> | 2009-03-07 16:05:39 +0200 |
| commit | 43d8c28fbdbbf6d9c90d4ea0902f16a5062eb9b4 (patch) | |
| tree | 266d56aef6c08639ca39c6188d4151d0211f3447 | |
| parent | 96d2af631908df62e471e02f171bf2f212bc4212 (diff) | |
Bugfix: Corrected /etc/resolv.conf mappings in devel and emulate modes.
- When debian package resolvconf is installed it creates directory
/etc/resolvconf and makes /etc/resolv.conf symlink that points
there. Now paths under /etc/resolvconf come also from host.
Signed-off-by: Lauri Aarnio <Lauri.Aarnio@iki.fi>
| -rw-r--r-- | lua_scripts/pathmaps/devel/00_default.lua | 5 | ||||
| -rw-r--r-- | lua_scripts/pathmaps/emulate/00_default.lua | 16 |
2 files changed, 18 insertions, 3 deletions
diff --git a/lua_scripts/pathmaps/devel/00_default.lua b/lua_scripts/pathmaps/devel/00_default.lua index 88288c5..5598a62 100644 --- a/lua_scripts/pathmaps/devel/00_default.lua +++ b/lua_scripts/pathmaps/devel/00_default.lua @@ -489,6 +489,8 @@ devel_mode_rules_etc = { {prefix = "/etc/apt", map_to = target_root, readonly = true}, -- Files that must not be mapped: + {prefix = "/etc/resolvconf", use_orig_path = true, + readonly = true}, {prefix = "/etc/resolv.conf", use_orig_path = true, readonly = true}, {path = "/etc/passwd", @@ -506,6 +508,9 @@ devel_mode_rules_var = { -- ----------------------------------------------- -- 80. /var/* + {prefix = "/var/run/resolvconf", use_orig_path = true, + readonly = true}, + {prefix = "/var/run", map_to = session_dir}, -- files from package "xkbutils": diff --git a/lua_scripts/pathmaps/emulate/00_default.lua b/lua_scripts/pathmaps/emulate/00_default.lua index 692cca9..d505287 100644 --- a/lua_scripts/pathmaps/emulate/00_default.lua +++ b/lua_scripts/pathmaps/emulate/00_default.lua @@ -81,6 +81,19 @@ mapall_chain = { readonly = true}, -- + -- Following 2 rules are needed because package + -- resolvconf makes resolv.conf to be symlink that + -- points to /etc/resolvconf/run/resolv.conf and + -- we want them all to come from host. + -- + {prefix = "/var/run/resolvconf", use_orig_path = true, + readonly = true}, + {prefix = "/etc/resolvconf", use_orig_path = true, + readonly = true}, + {prefix = "/etc/resolv.conf", use_orig_path = true, + readonly = true}, + + -- {prefix = "/var/run", map_to = session_dir}, -- @@ -96,9 +109,6 @@ mapall_chain = { {prefix = sbox_dir .. "/share/scratchbox2", use_orig_path = true}, - {prefix = "/etc/resolv.conf", use_orig_path = true, - readonly = true}, - -- ----------------------------------------------- {prefix = sbox_user_home_dir, use_orig_path = true}, |