mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-26 16:11:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

cros_image_to_target: when in chroot, call the chroot tools relative to /

Browse Source 
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 <zbehan@chromium.org>
Reviewed-by: Zdenek Behan <zbehan@chromium.org>
This commit is contained in:
Zdenek Behan 2011-08-24 21:35:48 +02:00
parent 7b57a7731d
commit 908a843d78
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/cros_image_to_target.py
View File

@ -185,8 +185,11 @@ class CrosEnv(object):
return os.path.join(self.cros_root, filename) return os.path.join(self.cros_root, filename)
def ChrootPath(self, filename): def ChrootPath(self, filename):
return self.CrosUtilsPath(os.path.join('..', '..', 'chroot', if os.path.exists('/etc/debian_chroot'):
filename.strip(os.path.sep))) return filename
else:
return self.CrosUtilsPath(os.path.join('..', '..', 'chroot',
filename.strip(os.path.sep)))
def FileOneLine(self, filename): def FileOneLine(self, filename):
return file(filename).read().rstrip('\r\n') return file(filename).read().rstrip('\r\n')