Skip to content

More potential paths for busybox executable #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amluto merged 2 commits into from
Sep 27, 2019
Merged

More potential paths for busybox executable #40

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f13dea
mkinitramfs: generate busybox paths instead of enumerating them expli…
zevweiss Dec 29, 2018
da7b73b
mkinitramfs: add candidate suffix for static busybox
zevweiss Dec 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions virtme/mkinitramfs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import io
import os.path
import shlex
import itertools
from . import cpiowriter
from . import modfinder
from . import virtmods
Expand Down Expand Up @@ -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
Expand Down