From a88bcbae850a2e6d182291d3f8e167aabdbe4842 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 Signed-off-by: William Bourque 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 97f5e848cc..880e464036 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 1.2.3-korg