From e90f7a24fe2c7e2bfa6bbe34d342d53e5134cc2d Mon Sep 17 00:00:00 2001 From: William Bourque Date: Mon, 11 Feb 2019 15:00:48 -0500 Subject: wic/engine.py: Load paths from PATH environment variable Load self.paths from environment variable and if it fails, fall back to hardcoded list. This is required for users that would need to load different e2fsprogs binaries if their system's ones are not recent enought (From OE-Core rev: a88bcbae850a2e6d182291d3f8e167aabdbe4842) (From OE-Core rev: c8331fa157b83a3ed77f77a6e884c7fbc4f1d91b) Signed-off-by: William Bourque Signed-off-by: Richard Purdie Signed-off-by: Armin Kuster Signed-off-by: Richard Purdie --- scripts/lib/wic/engine.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py index 951bf30717..c1270456f5 100644 --- a/scripts/lib/wic/engine.py +++ b/scripts/lib/wic/engine.py @@ -244,8 +244,13 @@ class Disk: self._psector_size = None self._ptable_format = None - # find parted - self.paths = "/bin:/usr/bin:/usr/sbin:/sbin/" + # read paths from $PATH environment variable + # if it fails, use hardcoded paths + try: + self.paths = os.environ['PATH'] + except KeyError: + self.paths = "/bin:/usr/bin:/usr/sbin:/sbin/" + if native_sysroot: for path in self.paths.split(':'): self.paths = "%s%s:%s" % (native_sysroot, path, self.paths) -- cgit v1.2.3-54-g00ecf