[rhel7-branch 3/8] livemedia-creator: Check fsimage kickstart for single partition (#1144140)
Brian C. Lane
bcl at redhat.com
Tue Sep 23 00:28:38 UTC 2014
(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 6301d4c..64129ea 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:
--
1.9.3
More information about the anaconda-patches
mailing list