commit f005fa74fded61d28841f8594c510331c89ee2db
author Ram Chandrasekar <rchandrasekar@google.com> Thu Jun 16 21:45:14 2022 +0000
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Jun 21 22:06:22 2022 +0000
tree 0da1d15e71b9c020f87f441a888ba97f6e555426
parent 2ebc04977fee41ddfd0df271563631fb3a57c4d3

scripts: build_image: Add short negative option for rootfs verification

Add a short option -r for --no-enable-rootfs-verification.

BUG=b:235865506
TEST=build_image --help

Change-Id: I73043c0381cd4cc969c90492dabf67be9b18d497
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3710478
Tested-by: Ram Chandrasekar <rchandrasekar@google.com>
Auto-Submit: Ram Chandrasekar <rchandrasekar@google.com>
Reviewed-by: Cindy Lin <xcl@google.com>
Commit-Queue: Ram Chandrasekar <rchandrasekar@google.com>

scripts/build_image.py

diff --git a/scripts/build_image.py b/scripts/build_image.py
index efe3e64..dc2ac91 100644
--- a/scripts/build_image.py
+++ b/scripts/build_image.py
@@ -39,12 +39,14 @@
 from chromite.service import image
 
 
-def build_shell_bool_style_args(parser: commandline.ArgumentParser,
-                                name: str,
-                                default_val: bool,
-                                help_str: str,
-                                deprecation_note: str,
-                                alternate_name: Optional[str] = None) -> None:
+def build_shell_bool_style_args(
+    parser: commandline.ArgumentParser,
+    name: str,
+    default_val: bool,
+    help_str: str,
+    deprecation_note: str,
+    alternate_name: Optional[str] = None,
+    additional_neg_options: Optional[List[str]] = None) -> None:
   """Build the shell boolean input argument equivalent.
 
   There are two cases which we will need to handle,
@@ -69,6 +71,7 @@
     help_str: The help string for the input argument.
     deprecation_note: A deprecation note to use.
     alternate_name: Alternate argument to be used after deprecation.
+    additional_neg_options: Additional negative alias options to use.
   """
   arg = f'--{name}'
   shell_narg = f'--no{name}'
@@ -78,6 +81,10 @@
   default_val_str = f'{help_str} (Default: %(default)s).'
 
   if alternate_name:
+    _alternate_narg_list = [alt_py_narg]
+    if additional_neg_options:
+      _alternate_narg_list.extend(additional_neg_options)
+
     parser.add_argument(
         alt_arg,
         action='store_true',
@@ -85,7 +92,7 @@
         dest=name,
         help=default_val_str)
     parser.add_argument(
-        alt_py_narg,
+        *_alternate_narg_list,
         action='store_false',
         dest=name,
         help="Don't " + help_str.lower())
@@ -106,8 +113,12 @@
       help=argparse.SUPPRESS)
 
   if not alternate_name:
+    _py_narg_list = [py_narg]
+    if additional_neg_options:
+      _py_narg_list.extend(additional_neg_options)
+
     parser.add_argument(
-        py_narg,
+        *_py_narg_list,
         action='store_false',
         dest=name,
         help="Don't " + help_str.lower())
@@ -205,7 +216,7 @@
   build_shell_bool_style_args(
       group, 'enable_rootfs_verification', True,
       'Make all bootloaders to use kernel based root-fs integrity checking.',
-      deprecation_note, 'enable-rootfs-verification')
+      deprecation_note, 'enable-rootfs-verification', ['-r'])
 
   # Advanced options.
   group = parser.add_argument_group('Advanced Options')