From fededc149050a0536998c3063f1d8a25b88159ef Mon Sep 17 00:00:00 2001
From: Le0xFF <43521247+Le0xFF@users.noreply.github.com>
Date: Sun, 26 Nov 2023 14:42:22 +0100
Subject: [PATCH] Create a dedicated `swap` subvolume - This should fix issue
 #11 - The only downside is that people that will not create a swap file, will
 eventually have a `@swap` subvolume. First world problem.

---
 old_unused/chroot.sh | 16 ++++++++--------
 vli.sh               | 20 ++++++++++++--------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/old_unused/chroot.sh b/old_unused/chroot.sh
index 2bc2054..d7220f2 100644
--- a/old_unused/chroot.sh
+++ b/old_unused/chroot.sh
@@ -545,19 +545,19 @@ function create_swapfile {
           if [[ -z "$swap_size" ]]; then
             swap_size=$ram_size
           fi
-          echo -e -n "\nA swapfile of ${BLUE_LIGHT}${swap_size}GB${NORMAL} will be created in ${BLUE_LIGHT}/var/swap/${NORMAL} btrfs subvolume...\n\n"
-          btrfs subvolume create /var/swap
-          btrfs filesystem mkswapfile /var/swap/swapfile --size "${swap_size}"G
-          mkswap --label SwapFile /var/swap/swapfile
-          swapon /var/swap/swapfile
-          RESUME_UUID=$(findmnt -no UUID -T /var/swap/swapfile)
-          RESUME_OFFSET=$(btrfs inspect-internal map-swapfile -r /var/swap/swapfile)
+          echo -e -n "\nA swapfile of ${BLUE_LIGHT}${swap_size}GB${NORMAL} will be created in ${BLUE_LIGHT}/swap/${NORMAL} btrfs subvolume...\n\n"
+          btrfs filesystem mkswapfile /swap/swapfile --size "${swap_size}"G
+          mkswap --label SwapFile /swap/swapfile
+          swapon /swap/swapfile
+          RESUME_UUID=$(findmnt -no UUID -T /swap/swapfile)
+          RESUME_OFFSET=$(btrfs inspect-internal map-swapfile -r /swap/swapfile)
           if [[ $bootloader =~ $regex_EFISTUB ]]; then
             sed -i "/OPTIONS=/s/\"$/ resume=UUID=$RESUME_UUID resume_offset=$RESUME_OFFSET&/" /etc/default/efibootmgr-kernel-hook
           elif [[ $bootloader =~ $regex_GRUB2 ]]; then
             sed -i "/GRUB_CMDLINE_LINUX_DEFAULT=/s/\"$/ resume=UUID=$RESUME_UUID resume_offset=$RESUME_OFFSET&/" /etc/default/grub
           fi
-          echo -e "\n# SwapFile\n/var/swap/swapfile none swap sw 0 0" >>/etc/fstab
+          echo -e -n "\n# Swap Subvolume\nUUID=$ROOT_UUID /swap btrfs $BTRFS_OPT,subvol=@swap 0 2\n" >>/etc/fstab
+          echo -e -n "\n# SwapFile\n/swap/swapfile none swap sw 0 0\n" >>/etc/fstab
           echo -e -n "\nEnabling zswap...\n"
           echo "add_drivers+=\" lz4hc lz4hc_compress z3fold \"" >>/etc/dracut.conf.d/40-add_zswap_drivers.conf
           echo -e -n "\nRegenerating dracut initramfs...\n\n"
diff --git a/vli.sh b/vli.sh
index 83f8c33..257a103 100755
--- a/vli.sh
+++ b/vli.sh
@@ -674,19 +674,19 @@ function create_swapfile {
           if [[ -z "$swap_size" ]]; then
             swap_size=$ram_size
           fi
-          echo -e -n "\nA swapfile of ${BLUE_LIGHT}${swap_size}GB${NORMAL} will be created in ${BLUE_LIGHT}/var/swap/${NORMAL} btrfs subvolume...\n\n"
-          btrfs subvolume create /var/swap
-          btrfs filesystem mkswapfile /var/swap/swapfile --size "${swap_size}"G
-          mkswap --label SwapFile /var/swap/swapfile
-          swapon /var/swap/swapfile
-          RESUME_UUID=$(findmnt -no UUID -T /var/swap/swapfile)
-          RESUME_OFFSET=$(btrfs inspect-internal map-swapfile -r /var/swap/swapfile)
+          echo -e -n "\nA swapfile of ${BLUE_LIGHT}${swap_size}GB${NORMAL} will be created in ${BLUE_LIGHT}/swap/${NORMAL} btrfs subvolume...\n\n"
+          btrfs filesystem mkswapfile /swap/swapfile --size "${swap_size}"G
+          mkswap --label SwapFile /swap/swapfile
+          swapon /swap/swapfile
+          RESUME_UUID=$(findmnt -no UUID -T /swap/swapfile)
+          RESUME_OFFSET=$(btrfs inspect-internal map-swapfile -r /swap/swapfile)
           if [[ $bootloader =~ $regex_EFISTUB ]]; then
             sed -i "/OPTIONS=/s/\"$/ resume=UUID=$RESUME_UUID resume_offset=$RESUME_OFFSET&/" /etc/default/efibootmgr-kernel-hook
           elif [[ $bootloader =~ $regex_GRUB2 ]]; then
             sed -i "/GRUB_CMDLINE_LINUX_DEFAULT=/s/\"$/ resume=UUID=$RESUME_UUID resume_offset=$RESUME_OFFSET&/" /etc/default/grub
           fi
-          echo -e "\n# SwapFile\n/var/swap/swapfile none swap sw 0 0" >>/etc/fstab
+          echo -e -n "\n# Swap Subvolume\nUUID=$ROOT_UUID /swap btrfs $BTRFS_OPT,subvol=@swap 0 2\n" >>/etc/fstab
+          echo -e -n "\n# SwapFile\n/swap/swapfile none swap sw 0 0\n" >>/etc/fstab
           echo -e -n "\nEnabling zswap...\n"
           echo "add_drivers+=\" lz4hc lz4hc_compress z3fold \"" >>/etc/dracut.conf.d/40-add_zswap_drivers.conf
           echo -e -n "\nRegenerating dracut initramfs...\n\n"
@@ -2330,6 +2330,7 @@ function format_create_install_system {
           echo -e -n "- /@\n"
           echo -e -n "- /@home\n"
           echo -e -n "- /@snapshots\n"
+          echo -e -n "- /@swap\n"
           echo -e -n "- /var/cache/xbps\n"
           echo -e -n "- /var/tmp\n"
           echo -e -n "- /var/log\n\n"
@@ -2355,10 +2356,13 @@ function format_create_install_system {
           btrfs subvolume create /mnt/@
           btrfs subvolume create /mnt/@home
           btrfs subvolume create /mnt/@snapshots
+          btrfs subvolume create /mnt/@swap
           umount /mnt
           mount -o "$BTRFS_OPT",subvol=@ "$final_drive" /mnt
           mkdir /mnt/home
           mount -o "$BTRFS_OPT",subvol=@home "$final_drive" /mnt/home/
+          mkdir /mnt/swap
+          mount -o "$BTRFS_OPT",subvol=@swap "$final_drive" /mnt/swap/
           mkdir -p /mnt/var/cache
           btrfs subvolume create /mnt/var/cache/xbps
           btrfs subvolume create /mnt/var/tmp