misc fixes

This commit is contained in:
Mike McLean 2015-12-11 15:56:03 -05:00
parent e562402709
commit cbd6ca9ced
2 changed files with 3 additions and 7 deletions

View file

@ -5254,17 +5254,12 @@ def handle_spin_livemedia(options, session, args):
help=_("Do not attempt to tag package"))
parser.add_option("--live-ostree-pxe", action="store_true",
help=_("Build a live pxe boot squashfs image of Atomic Host"))
(task_options, args) = parser.parse_args(args)
# LMC operations
parser.add_option("--disk-img", action="store_true",
help=_("Spin bootable disk media"))
parser.add_option("--live-ostree-pxe", action="store_true",
help=_("Spin live ostree PXE media"))
parser.add_option("--live-iso", action="store_true",
help=_("Spin live ISO media"))
(task_options, args) = parser.parse_args(args)
# Make sure the target and kickstart is specified.
if len(args) != 5:
@ -5597,7 +5592,7 @@ def _build_image(options, task_opts, session, args, img_type):
images with chroot-based tools.
"""
if img_type not in ('livecd', 'appliance'):
if img_type not in ('livecd', 'appliance', 'livemedia'):
raise koji.GenericError, 'Unrecognized image type: %s' % img_type
activate_session(session)

View file

@ -135,6 +135,7 @@ INSERT INTO channels (name) VALUES ('livecd');
INSERT INTO channels (name) VALUES ('appliance');
INSERT INTO channels (name) VALUES ('vm');
INSERT INTO channels (name) VALUES ('image');
INSERT INTO channels (name) VALUES ('livemedia');
-- Here we track the build machines
-- each host has an entry in the users table also