From e2e4014db3cbfa835e0ca771fc320151479c5021 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 4 May 2022 11:01:59 -0400 Subject: [PATCH] Make ubuntu case insensitive on import Ubuntu changes their minds about case of some files. --- confluent_server/confluent/osimage.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/confluent_server/confluent/osimage.py b/confluent_server/confluent/osimage.py index 59e8fc9b..b42084dc 100644 --- a/confluent_server/confluent/osimage.py +++ b/confluent_server/confluent/osimage.py @@ -197,7 +197,7 @@ def extract_entries(entries, flags=0, callback=None, totalsize=None, extractlist for entry in entries: if str(entry).endswith('TRANS.TBL'): continue - if extractlist and str(entry) not in extractlist: + if extractlist and str(entry).lower() not in extractlist: continue write_header(write_p, entry._entry_p) read_p = entry._archive_p @@ -369,7 +369,7 @@ def check_ubuntu(isoinfo): return {'name': 'ubuntu-{0}-{1}'.format(ver, arch), 'method': EXTRACT|COPY, 'extractlist': ['casper/vmlinuz', 'casper/initrd', - 'EFI/BOOT/BOOTx64.EFI', 'EFI/BOOT/grubx64.efi' + 'efi/boot/bootx64.efi', 'efi/boot/grubx64.efi' ], 'copyto': 'install.iso', 'category': 'ubuntu{0}'.format(major)}