From b72b41e690ed2b643566c71db70a24f2b15a7e9b Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 21 Apr 2016 10:29:18 -0700 Subject: [PATCH] Allow ostreesetup kickstart Also make sure that a --make_pxe_live --no-virt doesn't use autopart or other mountpoints. --- src/sbin/livemedia-creator | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/sbin/livemedia-creator b/src/sbin/livemedia-creator index d623805c..3cca322e 100755 --- a/src/sbin/livemedia-creator +++ b/src/sbin/livemedia-creator @@ -1300,9 +1300,10 @@ def main(): # Make the disk or filesystem image if not opts.disk_image and not opts.fs_image: errors = [] - 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 " - "fix your kickstart file." ) + if opts.no_virt and ks.handler.method.method not in ("url", "nfs") \ + and not ks.handler.ostreesetup.seen: + 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: 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, " "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 part_ok = not any(p for p in ks.handler.partition.partitions if p.mountpoint not in ["/", "swap"])