From e298db437e61c24105fc46c8e766f9c3b16dffad Mon Sep 17 00:00:00 2001
From: TommyTran732 <57488583+tommytran732@users.noreply.github.com>
Date: Fri, 23 Apr 2021 15:07:50 +0000
Subject: [PATCH] Update install.sh

---
 install.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/install.sh b/install.sh
index bf2397b..ad013e6 100644
--- a/install.sh
+++ b/install.sh
@@ -92,26 +92,29 @@ btrfs subvolume create /mnt/@ &>/dev/null
 btrfs subvolume create /mnt/@/.snapshots &>/dev/null
 mkdir /mnt/@/.snapshots/0 &>/dev/null
 btrfs subvolume create /mnt/@/.snapshots/1/snapshot &>/dev/null
-btrfs subvolume create /mnt/@/boot &>/dev/null
+btrfs subvolume create /mnt/@/boot/grub/ &>/dev/null
 btrfs subvolume create /mnt/@/home &>/dev/null
 btrfs subvolume create /mnt/@/root &>/dev/null
 btrfs subvolume create /mnt/@/var_log &>/dev/null
 btrfs subvolume create /mnt/@/var_crash &>/dev/null
 btrfs subvolume create /mnt/@/var_cache &>/dev/null
 btrfs subvolume create /mnt/@/var_tmp &>/dev/null
+btrfs subvolume create /mnt/@/var_spool &>/dev/null
 btrfs subvolume create /mnt/@/var_lib_gdm &>/dev/null
+btrfs subvolume create /mnt/@/AccountsService &>/dev/null
 chattr +C /mnt/@/var_log
 chattr +C /mnt/@/var_crash
 chattr +C /mnt/@/var_cache
 chattr +C /mnt/@/var_tmp
+chattr +C /mnt/@/var_spool
 btrfs subvolume set-default $(btrfs subvolume list /mnt | grep "@/.snapshots/1/snapshot" | grep -oP '(?<=ID )[0-9]+') /mnt
 
 # Mounting the newly created subvolumes.
 umount /mnt
 echo "Mounting the newly created subvolumes."
 mount -o ssd,noatime,space_cache,compress=zstd:15 $BTRFS /mnt
-mkdir -p /mnt/{boot,root,home,.snapshots,/var/log,/var/cache,/var/tmp,/var/crash,/var/lib/gdm,/var/lib/AccountsService}
-mount -o ssd,noatime,space_cache,compress=zstd:15,subvol=@/boot $BTRFS /mnt/boot
+mkdir -p /mnt/{/boot/grub,root,home,.snapshots,/var/log,/var/cache,/var/tmp,/var/crash,/var/lib/gdm,/var/lib/AccountsService}
+mount -o ssd,noatime,space_cache,compress=zstd:15,subvol=@/boot/grub $BTRFS /mnt/boot/grub
 mount -o ssd,noatime,space_cache,compress=zstd:15,subvol=@/root $BTRFS /mnt/root 
 mount -o ssd,noatime,space_cache.compress=zstd:15,subvol=@/home $BTRFS /mnt/home
 mount -o ssd,noatime,space_cache,compress=zstd:15,subvol=@/.snapshots $BTRFS /mnt/.snapshots
@@ -119,8 +122,9 @@ mount -o ssd,noatime,space_cache,compress=zstd:15,nodatacow,subvol=@/var_log $BT
 mount -o ssd,noatime,space_cache,compress=zstd:15,nodatacow,subvol=@/var_crash $BTRFS /mnt/var/crash
 mount -o ssd,noatime,space_cache,compress=zstd:15,nodatacow,subvol=@/var_cache $BTRFS /mnt/var/cache
 mount -o ssd,noatime,space_cache,compress=zstd:15,nodatacow,subvol=@/var_tmp $BTRFS /mnt/var/tmp
+mount -o ssd,noatime,space_cache,compress=zstd:15,nodatacow,subvol=@/var_tmp $BTRFS /mnt/var/spool
 mount -o ssd,noatime,space_cache,compress=zstd:15,subvol=@/var_lib_gdm $BTRFS /mnt/var/lib/gdm
-mount -o ssd,noatime,space_cache,compress=zstd:15,subvol=@/var_lib_AccountsService $BTRFS /mnt//var/lib/AccountsService
+mount -o ssd,noatime,space_cache,compress=zstd:15,subvol=@/var_lib_AccountsService $BTRFS /mnt/var/lib/AccountsService
 mkdir -p /mnt/boot/efi
 mount $ESP /mnt/boot/efi