From 60da403a54af9aed307937fb34a4fdc75f227a65 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa13@gmail.com>
Date: Fri, 3 Jul 2020 16:06:41 -0400
Subject: [PATCH] Use Btrfs for all Fedora desktop variants

All desktop variants of Fedora are changing to use Btrfs
as the default filesystem and partitioning scheme.

Reference: https://fedoraproject.org/wiki/Changes/BtrfsByDefault

Signed-off-by: Neal Gompa <ngompa13@gmail.com>
---
 fedora-arm-kde.ks          | 5 ++++-
 fedora-arm-lxde.ks         | 5 ++++-
 fedora-arm-lxqt.ks         | 5 ++++-
 fedora-arm-mate.ks         | 5 ++++-
 fedora-arm-soas.ks         | 5 ++++-
 fedora-arm-workstation.ks  | 5 ++++-
 fedora-arm-xfce.ks         | 5 ++++-
 fedora-disk-workstation.ks | 2 +-
 fedora-disk-xfce.ks        | 2 +-
 9 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/fedora-arm-kde.ks b/fedora-arm-kde.ks
index baa1bc2..3114a76 100644
--- a/fedora-arm-kde.ks
+++ b/fedora-arm-kde.ks
@@ -2,7 +2,10 @@
 %include fedora-arm-xbase.ks
 %include fedora-kde-common.ks
 
-part / --size=6300 --fstype ext4
+part btrfs.007 --fstype="btrfs" --size=6300
+btrfs none --label=fedora btrfs.007
+btrfs /home --subvol --name=home LABEL=fedora
+btrfs / --subvol --name=root LABEL=fedora
 
 %post
 
diff --git a/fedora-arm-lxde.ks b/fedora-arm-lxde.ks
index a45732b..645f6fb 100644
--- a/fedora-arm-lxde.ks
+++ b/fedora-arm-lxde.ks
@@ -2,7 +2,10 @@
 %include fedora-arm-xbase.ks
 %include fedora-lxde-common.ks
 
-part / --size=4100 --fstype ext4
+part btrfs.007 --fstype="btrfs" --size=4100
+btrfs none --label=fedora btrfs.007
+btrfs /home --subvol --name=home LABEL=fedora
+btrfs / --subvol --name=root LABEL=fedora
 
 %post
 
diff --git a/fedora-arm-lxqt.ks b/fedora-arm-lxqt.ks
index 96328f9..78f206c 100644
--- a/fedora-arm-lxqt.ks
+++ b/fedora-arm-lxqt.ks
@@ -2,7 +2,10 @@
 %include fedora-arm-xbase.ks
 %include fedora-lxqt-common.ks
 
-part / --size=4400 --fstype ext4 --asprimary
+part btrfs.007 --fstype="btrfs" --size=4400
+btrfs none --label=fedora btrfs.007
+btrfs /home --subvol --name=home LABEL=fedora
+btrfs / --subvol --name=root LABEL=fedora
 
 %packages
 # trojita not available on non-x86 platforms
diff --git a/fedora-arm-mate.ks b/fedora-arm-mate.ks
index eda7f79..c174bd7 100644
--- a/fedora-arm-mate.ks
+++ b/fedora-arm-mate.ks
@@ -2,7 +2,10 @@
 %include fedora-arm-xbase.ks
 %include fedora-mate-common.ks
 
-part / --size=7168 --fstype ext4
+part btrfs.007 --fstype="btrfs" --size=7168
+btrfs none --label=fedora btrfs.007
+btrfs /home --subvol --name=home LABEL=fedora
+btrfs / --subvol --name=root LABEL=fedora
 
 %post
 
diff --git a/fedora-arm-soas.ks b/fedora-arm-soas.ks
index 17770b7..b036b40 100644
--- a/fedora-arm-soas.ks
+++ b/fedora-arm-soas.ks
@@ -2,7 +2,10 @@
 %include fedora-arm-xbase.ks
 %include fedora-soas-common.ks
 
-part / --size=3300 --fstype ext4 --asprimary
+part btrfs.007 --fstype="btrfs" --size=3300
+btrfs none --label=fedora btrfs.007
+btrfs /home --subvol --name=home LABEL=fedora
+btrfs / --subvol --name=root LABEL=fedora
 
 %post
 
diff --git a/fedora-arm-workstation.ks b/fedora-arm-workstation.ks
index f769a82..31b95f5 100644
--- a/fedora-arm-workstation.ks
+++ b/fedora-arm-workstation.ks
@@ -2,7 +2,10 @@
 %include fedora-arm-xbase.ks
 %include fedora-workstation-common.ks
 
-part / --size=6200 --fstype ext4
+part btrfs.007 --fstype="btrfs" --size=6200
+btrfs none --label=fedora btrfs.007
+btrfs /home --subvol --name=home LABEL=fedora
+btrfs / --subvol --name=root LABEL=fedora
 
 %packages
 -initial-setup
diff --git a/fedora-arm-xfce.ks b/fedora-arm-xfce.ks
index ecca399..b960ce1 100644
--- a/fedora-arm-xfce.ks
+++ b/fedora-arm-xfce.ks
@@ -2,7 +2,10 @@
 %include fedora-arm-xbase.ks
 %include fedora-xfce-common.ks
 
-part / --size=5000 --fstype ext4
+part btrfs.007 --fstype="btrfs" --size=5000
+btrfs none --label=fedora btrfs.007
+btrfs /home --subvol --name=home LABEL=fedora
+btrfs / --subvol --name=root LABEL=fedora
 
 %post
 
diff --git a/fedora-disk-workstation.ks b/fedora-disk-workstation.ks
index 488bbd0..5342b13 100644
--- a/fedora-disk-workstation.ks
+++ b/fedora-disk-workstation.ks
@@ -6,7 +6,7 @@ bootloader --append="cma=256MB"
 
 services --enabled=sshd,NetworkManager,chronyd,zram-swap
 
-autopart --type=plain --noswap
+autopart --type=btrfs --noswap
 
 %packages
 -initial-setup
diff --git a/fedora-disk-xfce.ks b/fedora-disk-xfce.ks
index a102b64..70205b6 100644
--- a/fedora-disk-xfce.ks
+++ b/fedora-disk-xfce.ks
@@ -6,7 +6,7 @@ bootloader --append="cma=192MB"
 
 services --enabled=sshd,NetworkManager,chronyd,zram-swap
 
-autopart --type=plain --noswap
+autopart --type=btrfs --noswap
 
 %packages