From 908a843d78ebc91898bd9b7ebd75dce5dc993086 Mon Sep 17 00:00:00 2001 From: Zdenek Behan Date: Wed, 24 Aug 2011 21:35:48 +0200 Subject: [PATCH] cros_image_to_target: when in chroot, call the chroot tools relative to / This fixes a problem with chroots named other than 'chroot', but only when running inside the chroot. BUG=chromium-os:19596 TEST=run it inside the chroot Change-Id: I9532fe7762e2d7e277305fb948e5cabc242a5213 Reviewed-on: http://gerrit.chromium.org/gerrit/6597 Tested-by: Zdenek Behan Reviewed-by: Zdenek Behan --- bin/cros_image_to_target.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bin/cros_image_to_target.py b/bin/cros_image_to_target.py index 29c4057532..f4bd069d40 100755 --- a/bin/cros_image_to_target.py +++ b/bin/cros_image_to_target.py @@ -185,8 +185,11 @@ class CrosEnv(object): return os.path.join(self.cros_root, filename) def ChrootPath(self, filename): - return self.CrosUtilsPath(os.path.join('..', '..', 'chroot', - filename.strip(os.path.sep))) + if os.path.exists('/etc/debian_chroot'): + return filename + else: + return self.CrosUtilsPath(os.path.join('..', '..', 'chroot', + filename.strip(os.path.sep))) def FileOneLine(self, filename): return file(filename).read().rstrip('\r\n')