almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

Allow ostreesetup kickstart

Browse Source 
Also make sure that a --make_pxe_live --no-virt doesn't use autopart or
other mountpoints.
This commit is contained in:
Brian C. Lane 2016-04-21 10:29:18 -07:00
parent 5972df8d71
commit b72b41e690
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/sbin/livemedia-creator
View File

@ -1300,9 +1300,10 @@ def main():
# Make the disk or filesystem image # Make the disk or filesystem image
if not opts.disk_image and not opts.fs_image: if not opts.disk_image and not opts.fs_image:
errors = [] errors = []
if opts.no_virt and ks.handler.method.method not in ("url", "nfs"): if opts.no_virt and ks.handler.method.method not in ("url", "nfs") \
errors.append("Only url and nfs install methods are currently supported. Please " and not ks.handler.ostreesetup.seen:
"fix your kickstart file." ) errors.append("Only url, nfs and ostreesetup install methods are currently supported."
"Please fix your kickstart file." )
if ks.handler.method.method in ("url", "nfs") and not ks.handler.network.seen: if ks.handler.method.method in ("url", "nfs") and not ks.handler.network.seen:
errors.append("The kickstart must activate networking if " errors.append("The kickstart must activate networking if "
@ -1312,7 +1313,7 @@ def main():
errors.append("The kickstart must not set a display mode (text, cmdline, " errors.append("The kickstart must not set a display mode (text, cmdline, "
"graphical), this will interfere with livemedia-creator.") "graphical), this will interfere with livemedia-creator.")
if opts.make_fsimage: if opts.make_fsimage or (opts.make_pxe_live and opts.no_virt):
# Make sure the kickstart isn't using autopart and only has a / mountpoint # Make sure the kickstart isn't using autopart and only has a / mountpoint
part_ok = not any(p for p in ks.handler.partition.partitions part_ok = not any(p for p in ks.handler.partition.partitions
if p.mountpoint not in ["/", "swap"]) if p.mountpoint not in ["/", "swap"])