| |
@@ -108,13 +108,7 @@
|
| |
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
|
| |
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