From 162bf91b5ee0caa5fcf3ffc45e4114d8e8ac4c5c Mon Sep 17 00:00:00 2001 From: Tobias Ulmer Date: Wed, 6 Mar 2013 18:15:55 +0100 Subject: [PATCH] Revert "use the tools module instead of hardcoding chown" This reverts commit 52571c840e035bf9abc4e724b453001ce7abca8d. External tools and tools inside the chroot are different beasts. Revert my commit as this was plain wrong. Signed-off-by: Tobias Ulmer --- generic/tools.lua | 1 - local/e2build.lua | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/generic/tools.lua b/generic/tools.lua index 9c4dc0f..cf7528a 100644 --- a/generic/tools.lua +++ b/generic/tools.lua @@ -55,7 +55,6 @@ local toollist = { tar = { name = "tar", flags = "", optional = false }, sha1sum = { name = "sha1sum", flags = "", optional = false }, md5sum = { name = "md5sum", flags = "", optional = false }, - chown = { name = "chown", flags = "", optional = false }, chmod = { name = "chmod", flags = "", optional = false }, test = { name = "test", flags = "", optional = false }, cat = { name = "cat", flags = "", optional = false }, diff --git a/local/e2build.lua b/local/e2build.lua index 54057bc..7c433cf 100644 --- a/local/e2build.lua +++ b/local/e2build.lua @@ -349,8 +349,8 @@ local function fix_permissions(info, r, return_flags) local e = err.new("fixing permissions failed") e2lib.log(3, "fix permissions") e2tool.set_umask(info) - local argv = { "chroot_2_3", res.build_config.base, tools.get_tool("chown"), - "-R", "root:root", res.build_config.Tc } + local argv = { "chroot_2_3", res.build_config.base, "chown", "-R", + "root:root", res.build_config.Tc } rc, re = e2lib.e2_su_2_2(argv) e2tool.reset_umask(info) if not rc then -- 2.39.5