Merge pull request #102 from SUSE-Enceladus/hybridBoot

Support uefi-preferred boot mode

ec2uploadimg

@@ -107,11 +107,13 @@ def parse_args(args):
         help='AWS kernel ID (aki) to boot the new image (Optional)',
         metavar='AWS_AKI_ID'
     )
+    help_msg = 'Set the boot mode for the image, legacy-bios, uefi, '
+    help_msg += 'or uefi-preferred (Optional)'
     parser.add_argument(
         '--boot-mode',
         dest='bootMode',
-        help='Set the boot mode for the image, legacy-bios or uefi (Optional)',
-        choices=['', 'legacy-bios', 'uefi'],
+        help=help_msg,
+        choices=['', 'legacy-bios', 'uefi', 'uefi-preferred'],
         metavar='BOOT_MODE'
     )
     parser.add_argument(
@@ -430,7 +432,7 @@ def check_tpm_support_has_allowed_boot_options(args, logger):
     """This function checks that in case tpm is enabled, boot options are
     correct
     """
-    tpm_boot_options = ['uefi']
+    tpm_boot_options = ['uefi', 'uefi-preferred']
     if args.tpm and args.bootMode not in tpm_boot_options:
         logger.error(
             'TPM can only be set with --boot-mode set to %s' % str(

lib/ec2imgutils/VERSION

@@ -1 +1 @@
-10.0.1
+10.0.2

python3-ec2imgutils.spec

@@ -19,18 +19,18 @@
 %define upstream_name ec2imgutils
 
 Name:           python3-ec2imgutils
-Version:        10.0.1
+Version:        10.0.2
 Release:        0
 Summary:        Image management utilities for AWS EC2
 License:        GPL-3.0+
 Group:          System/Management
 Url:            https://github.com/SUSE-Enceladus/ec2imgutils
 Source0:        %{upstream_name}-%{version}.tar.bz2
 Requires:       python3
-Requires:       python3-boto3 >= 1.22.11
+Requires:       python3-boto3 >= 1.29.84
 Requires:       python3-dateutil
 Requires:       python3-paramiko
-BuildRequires:  python3-boto3 >= 1.22.11
+BuildRequires:  python3-boto3 >= 1.29.84
 BuildRequires:  python3-dateutil
 BuildRequires:  python3-setuptools
 BuildRequires:  python-rpm-macros