From dd76f34ec758ce26514b08c23da733914c837af5 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: May 16 2017 15:52:34 +0000
Subject: Merge #226 `cloud/docker: move to autopart with the new no home/swap/boot options to enable generic architecture images`


---

diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index f29bf44..1e78bed 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -42,8 +42,7 @@ services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
 
 zerombr
 clearpart --all
-part /boot/efi --fstype="vfat" --size=50
-part / --fstype ext4 --grow
+autopart --noboot --nohome --noswap --nolvm
 
 %include fedora-repo.ks
 
diff --git a/fedora-docker-common.ks b/fedora-docker-common.ks
index 2afda3f..23c375c 100644
--- a/fedora-docker-common.ks
+++ b/fedora-docker-common.ks
@@ -24,12 +24,9 @@ keyboard us
 network --bootproto=dhcp --device=link --activate --onboot=on
 reboot
 
-# boot partitions are irrelevant as none of that content is taken into the final docker image
-# We will be able to move to autopart when new pykickstart lands which adds option for noswap/noboot (fixed upstream)
 zerombr
 clearpart --all
-part /boot/efi --fstype="vfat" --size=100
-part / --fstype ext4 --grow
+autopart --noboot --nohome --noswap --nolvm
 
 %packages --excludedocs --instLangs=en --nocore
 fedora-release