From a7972a81f50f522418ce560393d19283aa9fa902 Mon Sep 17 00:00:00 2001
From: verita84 <verita84@noreply.localhost>
Date: Sat, 3 Dec 2022 15:13:09 +0000
Subject: [PATCH] Update 'arch.sh'

---
 arch.sh | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/arch.sh b/arch.sh
index fe3cc72..0fe446d 100755
--- a/arch.sh
+++ b/arch.sh
@@ -156,10 +156,7 @@ snapshots() {
     echo
     DATE=$(echo $(date +%Y-%m-%d-%H-%M-%S))
     btrfs sub snapshot / /.snapshots/root-${DATE}
-    echo "Title ${DATE}" >/boot/loader/entries/root-${DATE}.conf
-    echo 'linux /vmlinuz-linux-lts' >>/boot/loader/entries/root-${DATE}.conf
-    echo 'initrd /initramfs-linux-lts.img' >>/boot/loader/entries/root-${DATE}.conf
-    echo "options mitigations=off cryptdevice=UUID=$(blkid | grep ${BTRFS} | cut -d '"' -f2):root root=\"LABEL=arch\" rootflags=subvol=@.snapshots/"root-${DATE} "rw" >>/boot/loader/entries/root-${DATE}.conf
+    bootloader_entry "${DATE}" ".snapshots/root-${DATE}"
 }
 
 remove-snapshots() {
@@ -179,16 +176,23 @@ flatpaks() {
     done
 }
 
+bootloader_entry(){
+    ## $1=Boot Entry Name
+    ## $2=Volume Name
+    echo "default arch.conf" >/boot/loader/loader.conf
+    echo 'timeout 3 ' >>/boot/loader/loader.conf
+    echo "title $1" >/boot/loader/entries/$1.conf
+    echo 'linux /vmlinuz-linux-lts' >>/boot/loader/entries/$1.conf
+    echo 'initrd /initramfs-linux-lts.img' >>/boot/loader/entries/$1.conf
+    echo "options mitigations=off cryptdevice=UUID=$(blkid | grep ${BTRFS} | cut -d '"' -f2):root root=\"LABEL=arch\"  rootflags=subvol=@$2 rw" >>/boot/loader/entries/$1.conf
+}
+
+
 bootloader() {
     echo 'HOOKS=(base udev modconf block encrypt btrfs filesystems keyboard keymap lvm2 fsck)' >/etc/mkinitcpio.conf
     mkinitcpio -P
     bootctl install
-    echo 'default  arch.conf' >/boot/loader/loader.conf
-    echo 'timeout 3 ' >>/boot/loader/loader.conf
-    echo 'title Arch Linux' >/boot/loader/entries/arch.conf
-    echo 'linux /vmlinuz-linux-lts' >>/boot/loader/entries/arch.conf
-    echo 'initrd /initramfs-linux-lts.img' >>/boot/loader/entries/arch.conf
-    echo "options mitigations=off cryptdevice=UUID=$(blkid | grep ${BTRFS} | cut -d '"' -f2):root root=\"LABEL=arch\"  rootflags=subvol=@$ROOT_NAME rw" >>/boot/loader/entries/arch.conf
+    bootloader_entry "$ROOT_NAME" "arch" 
 }
 
  function setup_script() {