From b05c6352f27b2c31bb78147c3269f18c459e8ba6 Mon Sep 17 00:00:00 2001
From: chris <chris@flap.local>
Date: Sep 24 2019 20:52:40 +0000
Subject: remove legacy swap


Now that Anaconda enables swap on zram by default, we don't need to
enable any legacy swap LVs or partitions. But per conversation with
livecd-tools, keep the activation of swapfile created by
'livecd-iso-to-disk --swap-size-mb'

https://github.com/rhinstaller/anaconda/pull/2039
https://github.com/livecd-tools/livecd-tools/issues/133

---

diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index bfed175..46585f3 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -108,13 +108,7 @@ for arg in \`cat /proc/cmdline\` ; do
   fi
 done
 
-# enable swaps unless requested otherwise
-swaps=\`blkid -t TYPE=swap -o device\`
-if ! strstr "\`cat /proc/cmdline\`" noswap && [ -n "\$swaps" ] ; then
-  for s in \$swaps ; do
-    action "Enabling swap partition \$s" swapon \$s
-  done
-fi
+# enable swapfile if it exists
 if ! strstr "\`cat /proc/cmdline\`" noswap && [ -f /run/initramfs/live/\${livedir}/swap.img ] ; then
   action "Enabling swap file" swapon /run/initramfs/live/\${livedir}/swap.img
 fi