diff options
| author |   William Bourque <wbourque@gmail.com> | 2019-02-11 15:00:48 -0500 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-14 11:20:55 +0000 |
| commit | df91cbf7ac4a40d40cb7e70e9e45a171925fe434 (patch) | |
| tree | c1da95369970fed3c50b4602674d64d2bdeacb6c /scripts | |
| parent | d31259fa464cfc8ae3a1f6209e98153aca101060 (diff) | |
| download | openembedded-core-contrib-df91cbf7ac4a40d40cb7e70e9e45a171925fe434.tar.gz | |
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)
Signed-off-by: William Bourque <wbourque@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/wic/engine.py | 9 |
1 files changed, 7 insertions, 2 deletions
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) |