Rename 'args' to 'buildah_extra_args'

Signed-off-by: Trey Dockendorf <tdockendorf@osc.edu>

Author: treydock

README.md

@@ -140,9 +140,9 @@ packages:
 # control command verbosity. By default, it is 'INFO'.
 cmds:
   - cmd: 'echo hello'
-# 'cmd' also supports 'args' that are passed to 'buildah run'
+# 'cmd' also supports 'buildah_extra_args' that are passed to 'buildah run'
   - cmd: 'id user'
-    args: ['--volume', '/var/lib/sss:/var/lib/sss:z']
+    buildah_extra_args: ['--volume', '/var/lib/sss:/var/lib/sss:z']
 
 # OpenSCAP options to use with scap_benchmark or oval_eval. Each OpenSCAP 
 # command gets passed to the shell. By default, the results from OpenSCAP will be saved 

src/installer.py

@@ -215,10 +215,10 @@ def install_base_commands(self, commands):
         logging.info(f"COMMANDS: running these commands in {self.cname}")
         for c in commands:
             logging.info(c['cmd'])
-            args = []
-            if 'args' in c:
-              args.extend(c['args'])
-            args.extend([self.cname, '--', 'bash', '-c', c['cmd']])
+            build_cmd = ["buildah","run"]
+            if 'buildah_extra_args' in c:
+              build_cmd.extend(c['buildah_extra_args'])
+            args = [self.cname, '--', 'bash', '-c', c['cmd']]
             if 'loglevel' in c:
                 if c['loglevel'].upper() == "INFO":
                     loglevel = logging.info
@@ -228,7 +228,7 @@ def install_base_commands(self, commands):
                     loglevel = logging.error
             else:
                 loglevel = logging.error
-            out = cmd(["buildah","run"] + args, stderr_handler=loglevel)
+            out = cmd(build_cmd + args, stderr_handler=loglevel)
 
     def install_base_copyfiles(self, copyfiles):
         if len(copyfiles) == 0: