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
This commit is contained in:
chris 2019-09-24 14:52:40 -06:00
parent d9ee9210ba
commit b05c6352f2

View File

@ -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