fstab edits

CloneToDisk.sh

@@ -14,19 +14,16 @@ NO_CLEANUP=false
 IMG_FILE="PBX-root.img.lz4"
 
 MOUNT_PATH="/mnt/debian"
-MOUNT_POINTS=("/dev" "/dev/pts" "/proc" "/sys" "/sys/firmware/efi/efivars" "/run")
+MOUNT_POINTS=("/dev" "/dev/pts" "/proc" "/sys" "/run")
 
-BOOT_PART="null"
-EFI_PART="null"
-ROOT_PART="null"
+BOOT_PART="NULL"
+EFI_PART="NULL"
+ROOT_PART="NULL"
 
-VGROUP="PBX-vg"
+VGROUP="SangomaPBX-vg"
 ROOT_LV="root"
 SWAP_LV="swap_1"
-VG_PATH="/dev/mapper/PBX--vg-"
-
-GRUB_CMD="export PATH=/usr/sbin:$PATH && update-initramfs -u -k all
- && grub-install --target=x86_64-efi --efi-directory=/boot/efi --bootloader-id=debian && update-grub"
+VG_PATH="/dev/mapper/SangomaPBX--vg-"
 
 for arg in "$@"; do
   case $arg in
@@ -63,16 +60,15 @@ main() {
 
   dialogue
 
-  trap 'echo "Status Code: $?"; cleanup;' EXIT
+  assign_part_var
 
-  EFI_PART=$(get_partition $disk_name "1")
-  BOOT_PART=$(get_partition $disk_name "2")
-  ROOT_PART=$(get_partition $disk_name "3")
+  trap 'echo "Status Code: $?"; cleanup;' EXIT
 
   if [[ $NO_RETABLE == true ]]; then
     echo -e "${YELLOW}Option --noretable is specified. Tables will not be erased and no partitions will be created${RESET}"
   else
     rewrite_gpt_table
+    assign_part_var
     lvm_init
     make_filesystem
   fi
@@ -85,8 +81,8 @@ main() {
 
   install_grub
 
-  cleanup
   echo -e "${GREEN}Restore and resize complete!${RESET}"
+  exit 0
 }
 
 root_check() {
@@ -118,9 +114,18 @@ rewrite_gpt_table() {
   sgdisk -n 3:0:0 -t 3:8e00 -c 3:"Linux LVM" $disk_name
 
   partprobe || true
+
+  lsblk $disk_name
+
   echo -e "${GREEN}GPT table created. ${RESET}"
 }
 
+assign_part_var() {
+  EFI_PART=$(get_partition $disk_name "1")
+  BOOT_PART=$(get_partition $disk_name "2")
+  ROOT_PART=$(get_partition $disk_name "3")
+}
+
 lvm_init() {
   pvcreate $ROOT_PART -ff
 
@@ -184,7 +189,7 @@ get_partuuid() {
   local target_part="$1"
 
   local part_uuid="$(
-    lsblk -ln -o PATH,PARTUUID $disk_name | awk '$1=="${target_part}" {print $2}'
+    lsblk -ln -o PATH,PARTUUID $disk_name | awk -v target_part="$target_part" '$1==target_part {print $2}'
   )"
 
   printf "$part_uuid"
@@ -196,13 +201,13 @@ mount_chroot() {
   echo "Mounting restored system..."
 
   mkdir -p "${MOUNT_PATH}/boot"
+  mkdir -p "${MOUNT_PATH}/boot/efi"
+
   mount "${VG_PATH}${ROOT_LV}" $MOUNT_PATH
   mount $BOOT_PART "${MOUNT_PATH}/boot"
-
-  mkdir -p "${MOUNT_PATH}/boot/efi"
   mount $EFI_PART "${MOUNT_PATH}/boot/efi"
 
-  for i in "${MOUNT_POINTS[@]}"; do mount -B $i ${MOUNT_PATH}${i}; done
+  for i in "${MOUNT_POINTS[@]}"; do mount --bind -m "$i" "${MOUNT_PATH}${i}"; done
 
   echo -e "${GREEN}Mounts prepared for chroot.${RESET}"
 }
@@ -210,8 +215,8 @@ mount_chroot() {
 gen_fstab() {
   echo "Generating fstab..."
 
-  local boot_uuid=$(get_partuuid $BOOT_PART)
-  local efi_uuid=$(get_partuuid $BOOT_PART)
+  boot_uuid=$(get_partuuid $BOOT_PART)
+  efi_uuid=$(get_partuuid $EFI_PART)
 
   cp ./fstab_template ${MOUNT_PATH}/etc/fstab
 
@@ -223,10 +228,25 @@ gen_fstab() {
 
 install_grub() {
   echo "Entering chroot to reinstall GRUB..."
-  chroot $MOUNT_PATH /bin/bash -c "$GRUB_CMD"
+
+  CHROOT_LINUX_INSTALL="apt install --reinstall -y linux-image-6.1.0-44-amd64"
+  CHROOT_INITRAMFS="update-initramfs -u -k all"
+  CHROOT_GRUB_INSTALL="grub-install --target=x86_64-efi --efi-directory=/boot/efi --bootloader-id=debian"
+  CHROOT_GRUB_UPDATE="update-grub"
+
+  chroot_cmd "$CHROOT_LINUX_INSTALL"
+  chroot_cmd "$CHROOT_INITRAMFS"
+  chroot_cmd "$CHROOT_GRUB_INSTALL"
+  chroot_cmd "$CHROOT_GRUB_UPDATE"
+
   echo -e "${GREEN}Grub installed!${RESET}"
 }
 
+chroot_cmd() {
+  CHROOT_PATH="export PATH=/usr/sbin:/usr/bin:/sbin:/bin"
+  chroot $MOUNT_PATH /bin/bash -c "${CHROOT_PATH} && ${1}"
+}
+
 cleanup() {
   if [[ $NO_CLEANUP = true ]]; then
     echo -e "${YELLOW}No cleanup specified. Make sure to manually clean mounts.${RESET}" 1>&2

CloneToRaid0.sh

@@ -1,137 +0,0 @@
-#!/bin/bash
-set -e
-
-
-# THE RAINBOW HAHAHAH
-RED='\e[31m'
-GREEN='\e[32m'
-YELLOW='\e[33m'
-RESET='\e[0m'
-
-# root check
-if [[ $EUID -ne 0 ]]; then
-    echo -e "${RED}You must be root to do this." 1>&2
-    exit 100
-fi
-
-mount_points=("/dev" "/dev/pts" "/proc" "/sys" "/sys/firmware/efi/efivars" "/run")
-NO_WRITE=false
-
-# arguments
-for arg in "$@"; do
-    case $arg in
-        --nowrite)
-            NO_WRITE=true
-            shift
-            ;;
-        -h)
-            printf "%-20s %s\n" "Flags:" "Description:"
-            echo
-            printf "%-20s %s\n" "--nowrite" "Disables Writing to Disk only modifys Existing Partitions"
-            exit 1
-            ;;
-        *)
-            echo "Unknown option: $arg"
-            echo "Try -h"
-            exit 1
-            ;;
-    esac
-done
-
-
-cleanup() {
-    echo "Cleaning Mounts"
-    
-    umount -lf /mnt/ventoy 2>/dev/null || true
-
-    for i in "${mount_points[@]}"; do umount -lf "/mnt/debian$i" 2>/dev/null || true; done
-
-    umount -lf /mnt/debian/boot/efi 2>/dev/null || true
-    umount -lf /mnt/debian/boot 2>/dev/null || true
-    umount -lf /mnt/debian 2>/dev/null || true
-}
-trap 'echo "Status Code: $?"; cleanup;' EXIT
-
-# Set your target disk here
-udevadm trigger
-
-lsblk
-echo
-
-
-
-read -rp "Enter the target disk (e.g., sda): " disk_suffix
-disk_name="/dev/${disk_suffix}"
-
-echo "Chose disk $disk_name"
-echo
-
-if [[ $NO_WRITE == true ]]; then
-    echo -e "${YELLOW}--nowrite is specified no need for Img no disks will be written to${RESET}"
-else
-  read -rp "Enter the name of the usb partition in /dev/mapper (e.g., sda1): " disk_suffix
-
-    usb_name="/dev/mapper/${disk_suffix}"
-
-    user_response="n"
-
-    read -rp "$(echo -e "${RED}You are about to WRITE and ERASE disk ${disk_name} | Are you sure? y/N: ${RESET}")" user_response
-
-    if [[ $user_response != y ]]; then
-        echo "Exiting script"
-        exit
-    fi
-
-    echo "Mounting Ventoy..."
-    mkdir -p /mnt/ventoy
-    mount $usb_name /mnt/ventoy
-    cd /mnt/ventoy/Images
-
-    echo "Writing image to $disk_name..."
-    lz4 -dc PBX-LVM.img.lz4 | dd of=$disk_name status=progress
-fi
-
-
-# Repartition disk using sgdisk
-echo "Repairing partition tables"
-sgdisk -e $disk_name
-sgdisk -v $disk_name
-
-partprobe || true
-
-echo "Expanding Partition 3 on $disk_name..."
-sgdisk --delete=3 $disk_name
-sgdisk --new=3:0:0 --typecode=3:8e00 --change-name=3:"Linux LVM" $disk_name
-
-partprobe || true
-
-# Resize physical volume
-echo "Resizing physical volume..."
-pvresize ${disk_name}3 || true
-
-# Resize swap and root logical volumes
-echo "Resizing swap and root volumes..."
-lvresize -L +7G PBX-vg/swap_1
-lvresize -l +100%FREE --resizefs PBX-vg/root
-
-
-# Mount restored system for chroot
-echo "Mounting restored system..."
-mkdir -p /mnt/debian
-mount /dev/mapper/PBX--vg-root /mnt/debian/
-mount ${disk_name}2 /mnt/debian/boot
-mount ${disk_name}1 /mnt/debian/boot/efi
-
-
-for i in "${mount_points[@]}"; do mount -B $i /mnt/debian$i; done
-
-# Chroot and reinstall GRUB
-echo "Entering chroot to reinstall GRUB..."
-chroot /mnt/debian /bin/bash -c "
-grub-install --target=x86_64-efi --efi-directory=/boot/efi --bootloader-id=debian
-update-grub
-"
-
-echo -e "${GREEN}Restore and resize complete!${RESET}"
-
-cleanup

fstab_template

@@ -8,12 +8,12 @@
 # Please run 'systemctl daemon-reload' after making changes here.
 
 # <file system> <mount point> <type> <options> <dump> <pass>
-/dev/mapper/PBX--vg-root / ext4 errors=remount-ro 0 1
+/dev/mapper/SangomaPBX--vg-root / ext4 errors=remount-ro 0 1
 
 # /boot was on /dev/vda2 during installation
-UUID=BOOT_UUID /boot ext2 defaults 0 2
+UUID=BOOT_UUID /boot ext4 defaults 0 2
 
 # /boot/efi was on /dev/vda1 during installation
 UUID=EFI_UUID /boot/efi vfat umask=0077 0 1
 
-/dev/mapper/PBX--vg-swap_1 none swap sw 0 0
+/dev/mapper/SangomaPBX--vg-swap_1 none swap sw 0 0