diff options
author | Andrew Lutomirski <luto@kernel.org> | 2019-09-27 09:36:26 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-27 09:36:26 -0700 |
commit | 716182ed7f0d5d57a2d488983a9b42698bc501d8 (patch) | |
tree | aa836a8f277be15e9e90d3af3e3c5a2e114fdab0 | |
parent | f4cd13a9c6328633f8af729d777ad9490e7cf585 (diff) | |
parent | da7b73b936e355d1dc6a7933895038d91a218412 (diff) | |
download | virtme-716182ed7f0d5d57a2d488983a9b42698bc501d8.tar.gz |
Merge pull request #40 from zevweiss/more-bbox-paths
More potential paths for busybox executable
-rw-r--r-- | virtme/mkinitramfs.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/virtme/mkinitramfs.py b/virtme/mkinitramfs.py index baaefe9..51f6fc6 100644 --- a/virtme/mkinitramfs.py +++ b/virtme/mkinitramfs.py @@ -9,6 +9,7 @@ import shutil import io import os.path import shlex +import itertools from . import cpiowriter from . import modfinder from . import virtmods @@ -165,12 +166,12 @@ def mkinitramfs(out, config): cw.write_trailer() def find_busybox(root, is_native): - for path in ('usr/local/bin/busybox', 'usr/local/sbin/busybox', - 'usr/bin/busybox-static', - 'usr/bin/busybox', 'usr/sbin/busybox', - 'bin/busybox', 'sbin/busybox'): - if os.path.isfile(os.path.join(root, path)): - return os.path.join(root, path) + for p in itertools.product(['usr/local', 'usr', ''], + ['bin', 'sbin'], + ['', '-static', '.static']): + path = os.path.join(root, p[0], p[1], 'busybox' + p[2]) + if os.path.isfile(path): + return path if is_native: # Try the host's busybox, if any |