aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Lutomirski <luto@kernel.org>2019-10-17 16:01:01 -0700
committerGitHub <noreply@github.com>2019-10-17 16:01:01 -0700
commit92c755867e256e1bc9edde3b7d6633ef6285d65b (patch)
treee7c087f7b7aa87740c9b9bf1a692aeb2bc4d7ba7
parent8a914171ac633ad4b88ac704b6a5693c2e2e6164 (diff)
parentf2b13f805a203b7aaa5e4ba09cceb06396903e6c (diff)
downloadvirtme-92c755867e256e1bc9edde3b7d6633ef6285d65b.tar.gz
Merge pull request #52 from marcosps/mpdesouza_busybox_tumbleweed
mkinitramfs.py: Search for busybox{.,-}static first
-rw-r--r--virtme/mkinitramfs.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/virtme/mkinitramfs.py b/virtme/mkinitramfs.py
index 8fb2f0e..193f510 100644
--- a/virtme/mkinitramfs.py
+++ b/virtme/mkinitramfs.py
@@ -169,7 +169,7 @@ def mkinitramfs(out, config) -> None:
def find_busybox(root, is_native) -> Optional[str]:
for p in itertools.product(['usr/local', 'usr', ''],
['bin', 'sbin'],
- ['', '-static', '.static']):
+ ['-static', '.static', '']):
path = os.path.join(root, p[0], p[1], 'busybox' + p[2])
if os.path.isfile(path):
return path