summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorMichael Brown2022-04-06 15:36:07 +0200
committerMichael Brown2022-04-06 15:36:07 +0200
commit70995397e5bdfd3431e12971aa40630c7014785f (patch)
tree8446b288f718654e1f80acbbb06db47f837bd0ef /contrib
parent[acpi] Support the "_RTXMAC_" format for ACPI-based MAC addresses (diff)
downloadipxe-70995397e5bdfd3431e12971aa40630c7014785f.tar.gz
ipxe-70995397e5bdfd3431e12971aa40630c7014785f.tar.xz
ipxe-70995397e5bdfd3431e12971aa40630c7014785f.zip
[cloud] Allow aws-import script to run on Python 3.6
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/cloud/aws-import2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/cloud/aws-import b/contrib/cloud/aws-import
index eef4302d..b9a350f6 100755
--- a/contrib/cloud/aws-import
+++ b/contrib/cloud/aws-import
@@ -16,7 +16,7 @@ BLOCKSIZE = 512 * 1024
def detect_architecture(image):
"""Detect CPU architecture"""
mdir = subprocess.run(['mdir', '-b', '-i', image, '::/EFI/BOOT'],
- capture_output=True)
+ stdout=subprocess.PIPE, stderr=subprocess.PIPE)
if any(b'BOOTAA64.EFI' in x for x in mdir.stdout.splitlines()):
return 'arm64'
return 'x86_64'