#2540 Add nomacboot option for spin-livemedia
Merged 3 years ago by tkopecek. Opened 3 years ago by breilly.
breilly/koji nomacboot-1296  into  master

file modified
+1 -1
@@ -3553,7 +3553,7 @@ 

                      '--releasever', version,

                      ])

  

-         if arch == 'x86_64':

+         if arch == 'x86_64' and not opts.get('nomacboot'):

              cmd.append('--macboot')

          else:

              cmd.append('--nomacboot')

file modified
+3 -1
@@ -5701,6 +5701,8 @@ 

                        help=_('The URL to the SCM containing any custom lorax '

                               'templates that are to be used to override the '

                               'default templates.'))

+     parser.add_option('--nomacboot', action="store_true",

+                       help=_("Pass the nomacboot option to livemedia-creator"))

From the code, --nomacboot will always be appended to livemedia_creator for non-x86_64 arches, so this option impacts x86_64 only.

Maybe adding some info in help or doc?

      (task_options, args) = parser.parse_args(args)

  

      # Make sure the target and kickstart is specified.
@@ -6083,7 +6085,7 @@ 

          'format', 'install_tree_url', 'isoname', 'ksurl',

          'ksversion', 'release', 'repo', 'scratch', 'skip_tag',

          'specfile', 'vcpu', 'vmem', 'volid', 'optional_arches',

-         'lorax_dir', 'lorax_url',

+         'lorax_dir', 'lorax_url', 'nomacboot',

      ]

      for opt in passthru_opts:

          val = getattr(task_opts, opt, None)

@@ -37,6 +37,7 @@ 

      "install_tree_url": None,

      "lorax_dir": None,

      "lorax_url": None,

+     "nomacboot": False,

      "optional_arches": None,

      "volid": None,

  }
@@ -422,6 +423,7 @@ 

    --lorax_url=URL       The URL to the SCM containing any custom lorax

                          templates that are to be used to override the default

                          templates.

+   --nomacboot           Pass the nomacboot option to livemedia-creator

  """ % (self.progname))

  

  

From the code, --nomacboot will always be appended to livemedia_creator for non-x86_64 arches, so this option impacts x86_64 only.

Maybe adding some info in help or doc?

Metadata Update from @tkopecek:
- Pull-request tagged with: testing-ready

3 years ago

Metadata Update from @jcupova:
- Pull-request tagged with: testing-done

3 years ago

Commit b5f7da1 fixes this pull-request

Pull-Request has been merged by tkopecek

3 years ago