From 8f2283cf1cbfb561e49dd3fb6269f5f80762d248 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Thu, 3 Apr 2014 10:45:06 -0700 Subject: [PATCH] livemedia-creator: Check fsimage kickstart for single partition (#1144140) (cherry picked from commit 30591349cac92046781cd67756a6d81209dd4087) Related: rhbz#1144140 --- src/sbin/livemedia-creator | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/sbin/livemedia-creator b/src/sbin/livemedia-creator index 6301d4c5..64129ea2 100755 --- a/src/sbin/livemedia-creator +++ b/src/sbin/livemedia-creator @@ -951,8 +951,13 @@ if __name__ == '__main__': errors.append("The kickstart must not set a display mode (text, cmdline, " "graphical), this will interfere with livemedia-creator.") - # TODO add a check for fsimage partition, no autopart and only / or swap part - + if opts.make_fsimage: + # 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"]) + if not part_ok or ks.handler.autopart.seen: + errors.append("Filesystem images must use a single / part, not autopart or " + "multiple partitions. swap is allowed but not used.") if errors: for e in errors: