clean repo

.gitattributes

@@ -1 +0,0 @@
-*.lz4 filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -1,4 +1 @@
-PBX.img
-PBX.qcow2
-PBX-Test.qcow2
-*.snapshot*
+*.zst

CloneToDisk.sh

@@ -6,10 +6,24 @@ GREEN='\e[32m'
 YELLOW='\e[33m'
 RESET='\e[0m'
 
-MOUNT_POINTS=("/dev" "/dev/pts" "/proc" "/sys" "/sys/firmware/efi/efivars" "/run")
 NO_WRITE=false
 NO_RETABLE=false
 NO_USB=false
+NO_CLEANUP=false
+
+IMG_FILE="PBX-Image-*.tar.zst"
+
+MOUNT_PATH="/mnt/debian"
+MOUNT_POINTS=("/dev" "/dev/pts" "/proc" "/sys" "/run")
+
+BOOT_PART="NULL"
+EFI_PART="NULL"
+ROOT_PART="NULL"
+
+VGROUP="SangomaPBX-vg"
+ROOT_LV="root"
+SWAP_LV="swap_1"
+VG_PATH="/dev/mapper/SangomaPBX--vg-"
 
 for arg in "$@"; do
   case $arg in
@@ -21,8 +35,8 @@ for arg in "$@"; do
     NO_RETABLE=true
     shift
     ;;
-  --nousb)
-    NO_USB=true
+  --nocleanup)
+    NO_CLEANUP=true
     shift
     ;;
   -h)
@@ -41,107 +55,34 @@ done
 
 main() {
   root_check
+  check_dependencies
 
   udevadm trigger
 
-  lsblk
-  echo
+  dialogue
 
-  read -rp "Enter the target disk (e.g., sda): " disk_suffix
-  disk_name="/dev/${disk_suffix}"
-
-  echo "Chose disk $disk_name"
-  echo
+  assign_part_var
 
   trap 'echo "Status Code: $?"; cleanup;' EXIT
 
   if [[ $NO_RETABLE == true ]]; then
-    echo -e "${YELLOW}--noretable is specified. Tables will not be erased and no partitions will be created${RESET}"
+    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
 
-  if [[ $NO_WRITE == true ]]; then
-    echo -e "${YELLOW}--nowrite is specified. No need for Img no disks will be written to${RESET}"
-  fi
+  mount_partitions
+  write_img
+  mount_chroot
 
-  # Resize physical volume
-  echo "Resizing physical volume..."
-  pvresize $(get_partition $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
-
-  echo "Generating fstab..."
-  boot_uuid=$()
-
-  cp ./fstab_template ${mount_path}/etc/fstab
-
-  sed --in-place "s/boot_uuid/$(get_partuuid $disk_name "2")/g" ${mount_path}/etc/fstab
-  sed --in-place "s/efi_uuid/$(get_partuuid $disk_name "1")/g" ${mount_path}/etc/fstab
-
-  # Chroot and reinstall GRUB
-  echo "Entering chroot to reinstall GRUB..."
-  chroot $mount_path /bin/bash -c "
-grub-install --target=x86_64-efi --efi-directory=/boot/efi --bootloader-id=debian
-update-grub
-"
+  gen_fstab
+  install_grub
 
   echo -e "${GREEN}Restore and resize complete!${RESET}"
-}
-
-write_image() {
-  if [[ $NO_USB == true ]]; then
-    echo "Writing image to $(get_partition $disk_name "3")..."
-    lz4 -dc ./Image/PBX.img3.lz4 | dd of=$(get_partition $disk_name "3") status=progress
-
-    partprobe || true
-
-  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 $(get_partition $disk_name "3")..."
-    lz4 -dc PBX.img.lz4 | dd of=$(get_partition $disk_name "3") status=progress
-
-    partprobe || true
-  fi
-
-}
-
-rewrite_gpt_table() {
-  sgdisk -Z $disk_name
-
-  sgdisk -c $disk_name
-
-  sgdisk -n 1:1MiB:+512M -t 1:ef00 -c 1:"EFI System" $disk_name
-  sgdisk -n 2:0:+1G -t 2:8300 -c 2:"boot" $disk_name
-  sgdisk -n 3:0:0 -t 3:8e00 -c 3:"Linux LVM" $disk_name
-
-  partprobe || true
-}
-
-make_filesystem() {
-  mkfs.vfat -F 32 $(get_partition $disk_name "1")
-  mkfs.ext4 $(get_partition $disk_name "2")
+  exit 0
 }
 
 root_check() {
@@ -151,16 +92,123 @@ root_check() {
   fi
 }
 
-cleanup() {
-  echo "Cleaning Mounts"
+check_dependencies() {
+  local missing=()
+  local required_tools=("sgdisk" "pv" "pvcreate" "vgcreate" "lvcreate" "vgchange" "mkfs.vfat" "mkfs.ext4" "mkswap" "tar" "zstd" "lsblk" "partprobe" "chroot")
 
-  umount -lf /mnt/ventoy 2>/dev/null || true
+  for tool in "${required_tools[@]}"; do
+    if ! command -v "$tool" &>/dev/null; then
+      missing+=("$tool")
+    fi
+  done
 
-  for i in "${MOUNT_POINTS[@]}"; do umount -lf "/mnt/debian$i" 2>/dev/null || true; done
+  if [[ ${#missing[@]} -gt 0 ]]; then
+    echo -e "${RED}Missing required tools: ${missing[*]}${RESET}"
+    echo
+    echo "Install with:"
+    echo "  apt install gdisk pv lvm2 zstd dosfstools e2fsprogs parted util-linux coreutils"
+    exit 1
+  fi
 
-  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
+  echo -e "${GREEN}All dependencies found${RESET}"
+}
+
+dialogue() {
+  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 == false ]]; then
+    echo -e "${RED}WARNING: ALL DATA ON ${disk_name} WILL BE DESTROYED${RESET}"
+  elif [[ $NO_RETABLE == false ]]; then
+    echo -e "${YELLOW}INFO: Running in NO WRITE mode. No data will be written to disk${RESET}"
+  else
+    echo -e "${YELLOW}WARNING: Existing partitions will be used but filesystems and file data may be modified${RESET}"
+  fi
+
+  lsblk $disk_name
+  echo
+
+  read -rp "Are you sure you want to continue? (yes/no): " confirm
+  if [[ "$confirm" != "yes" ]]; then
+    echo "Aborted."
+    exit 0
+  fi
+}
+
+rewrite_gpt_table() {
+  vgchange -an $VGROUP 2>/dev/null || true
+  vgremove -f $VGROUP 2>/dev/null || true
+  pvremove -ff $ROOT_PART 2>/dev/null || true
+
+  sgdisk -Z $disk_name
+
+  sgdisk -c $disk_name
+
+  sgdisk -n 1:1MiB:+512M -t 1:ef00 -c 1:"EFI System" $disk_name
+  sgdisk -n 2:0:+1G -t 2:8300 -c 2:"boot" $disk_name
+  sgdisk -n 3:0:0 -t 3:8e00 -c 3:"Linux LVM" $disk_name
+
+  partprobe 2>/dev/null ||
+    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
+
+  vgcreate $VGROUP $ROOT_PART -f
+
+  vgchange -ay $VGROUP
+
+  lvcreate -L 4G $VGROUP -n swap_1
+  lvcreate -l 100%FREE $VGROUP -n root
+
+  echo -e "${GREEN}LVM initialized ${RESET}"
+}
+
+make_filesystem() {
+  mkfs.vfat -I -F 32 $EFI_PART
+  mkfs.ext4 -F $BOOT_PART
+  mkfs.ext4 -F "${VG_PATH}${ROOT_LV}"
+  mkswap -f "${VG_PATH}${SWAP_LV}"
+  echo -e "${GREEN}Make filesystems finished.${RESET}"
+}
+
+write_img() {
+  if [[ $NO_WRITE == true ]]; then
+    echo -e "${YELLOW}Option --nowrite is specified. No need for Img no disks will be written to${RESET}"
+    return 0
+  fi
+
+  local img_file_dir=$(ls -1 ./PBX-Image-*.tar.zst 2>/dev/null | head -n1)
+
+  if [[ -z "$img_file_dir" ]]; then
+    img_file_dir=$(ls -1 ./Image/PBX-Image-*.tar.zst 2>/dev/null | head -n1)
+  fi
+  if [[ -z "$img_file_dir" ]]; then
+    echo -e "${RED}NO TAR.ZST FILE FOUND${RESET}"
+    exit 100
+  fi
+
+  echo "Writing image to ${VG_PATH}${ROOT_LV}..."
+
+  pv "${img_file_dir}" | tar -I zstd -x -C "${MOUNT_PATH}"
+
+  echo -e "${GREEN}Finished writing image to disk${RESET}"
 }
 
 get_partition() {
@@ -177,32 +225,85 @@ get_partition() {
 }
 
 get_partuuid() {
-  local disk_name="$1"
-  local part_num="$2"
+  local target_part="$1"
 
-  local part_uuid="$(
-    lsblk -ln -o PATH,PARTUUID $disk_name | awk '$1==$(get_partition $disk_name $part_num) {print $2}'
-  )"
+  blkid -s UUID -o value "$target_part"
+}
 
-  printf "$part_uuid"
+mount_partitions() {
+  echo "Mounting partitions..."
+
+  vgchange -ay $VGROUP
+
+  mkdir -p "${MOUNT_PATH}"
+  mount "${VG_PATH}${ROOT_LV}" $MOUNT_PATH
+
+  mkdir -p "${MOUNT_PATH}/boot"
+  mount $BOOT_PART "${MOUNT_PATH}/boot"
+
+  mkdir -p "${MOUNT_PATH}/boot/efi"
+  mount $EFI_PART "${MOUNT_PATH}/boot/efi"
 }
 
 mount_chroot() {
-  vgchange -ay PBX-vg
-
-  mount_path="/mnt/debian"
-
   echo "Mounting restored system..."
 
-  mkdir -p $mount_path/boot
-  mount /dev/mapper/PBX--vg-root $mount_path
-  mount $(get_partition $disk_name "2") ${mount_path}/boot
+  for i in "${MOUNT_POINTS[@]}"; do mount --bind -m "$i" "${MOUNT_PATH}${i}"; done
 
-  mkdir -p $mount_path/boot/efi
-  mount $(get_partition $disk_name "1") ${mount_path}/boot/efi
+  if [[ -d /sys/firmware/efi/efivars ]]; then
+    mount -t efivarfs efivarfs "${MOUNT_PATH}/sys/firmware/efi/efivars"
+  fi
 
-  for i in "${MOUNT_POINTS[@]}"; do mount -B $i ${mount_path}${i}; done
+  echo -e "${GREEN}Mounts prepared for chroot.${RESET}"
+}
+
+gen_fstab() {
+  echo "Generating fstab..."
+
+  boot_uuid=$(get_partuuid $BOOT_PART)
+  efi_uuid=$(get_partuuid $EFI_PART)
+
+  cp ./fstab_template ${MOUNT_PATH}/etc/fstab
+
+  sed --in-place "s/BOOT_UUID/${boot_uuid}/g" ${MOUNT_PATH}/etc/fstab
+  sed --in-place "s/EFI_UUID/${efi_uuid}/g" ${MOUNT_PATH}/etc/fstab
+
+  echo -e "${GREEN}fstab write complete!${RESET}"
+}
+
+install_grub() {
+  echo "Entering chroot to reinstall GRUB..."
+
+  CHROOT_GRUB_INSTALL="grub-install --target=x86_64-efi --efi-directory=/boot/efi --bootloader-id=debian"
+  CHROOT_GRUB_UPDATE="update-grub"
+
+  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
+    exit 100
+  fi
+
+  echo "Cleaning Mounts"
+
+  for i in "${MOUNT_POINTS[@]}"; do umount -lf "${MOUNT_PATH}${i}" 2>/dev/null || true; done
+
+  umount -lf "${MOUNT_PATH}/boot/efi" 2>/dev/null || true
+  umount -lf "${MOUNT_PATH}/boot" 2>/dev/null || true
+  umount -lf "${MOUNT_PATH}" 2>/dev/null || true
+
+  vgchange -an $VGROUP
+  echo -e "${GREEN}Clean.${RESET}"
 }
 
 main
-cleanup

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

Image/PBX.img.lz4

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0bb94626e3a51df1a374c3123ee3746c6920beeb3172de2c74966dea6b2d475d
-size 7809018129

Image/PBX.img3.lz4

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0b6c2daf667a6c852437975a217e9dd7e3052f5fee8b391ebc1efa67aaca8001
-size 7783924407

Image/extract_partition.sh

@@ -1,33 +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
-
-echo "Converting to IMG"
-qemu-img convert -f qcow2 -O raw PBX.qcow2 PBX.img
-
-losetup -fP PBX.img
-loop_device=$(losetup -l | grep "PBX.img" | cut -d ' ' -f1)
-echo $loop_device
-
-vgchange -a y PBX-vg
-lvreduce -L 14G -r PBX-vg/root
-lvreduce -L 976M PBX-vg/swap_1
-
-sgdisk --delete=3 $loop_device
-sgdisk --new=3:+0:+15G --typecode=3:8e00 --change-name=3:"Linux LVM" $loop_device
-vgchange -a n PBX-vg
-
-dd if=/dev/loop0p3 bs=64M conv=sync status=progress | lz4 -z > ./PBX3.img.lz4
-
-losetup -D

fs_extract.sh

@@ -0,0 +1,70 @@
+#!/bin/bash
+set -e
+
+RED='\e[31m'
+GREEN='\e[32m'
+YELLOW='\e[33m'
+RESET='\e[0m'
+
+IMG_FILE="PBX-Test.img"
+
+ROOT_LV_PATH="/dev/mapper/PBX--vg-root"
+MOUNT_PATH="/mnt/debian"
+VGROUP="PBX-vg"
+
+main() {
+  root_check
+
+  trap 'echo "Status Code: $?"; cleanup;' EXIT
+
+  losetup -fP $IMG_FILE
+  LOOP_DEVICE=$(losetup -l | grep $IMG_FILE | cut -d ' ' -f1)
+  echo $LOOP_DEVICE
+
+  vgchange -a y $VGROUP
+
+  mkdir -p $MOUNT_PATH
+
+  mount $ROOT_LV_PATH $MOUNT_PATH
+  mount "${LOOP_DEVICE}p2" "$MOUNT_PATH/boot"
+  mount "${LOOP_DEVICE}p1" "$MOUNT_PATH/boot/efi"
+
+  KERNEL_VERSION=$(get_kernel_version)
+
+  tar -I zstd -c -C "${MOUNT_PATH}" --warning=no-file-ignored . | pv >"PBX-Image-${KERNEL_VERSION}.tar.zst"
+}
+
+root_check() {
+  if [[ $EUID -ne 0 ]]; then
+    echo -e "${RED}You must be root to do this." 1>&2
+    exit 77
+  fi
+}
+
+get_kernel_version() {
+  local kernel_file=$(ls -1 "$MOUNT_PATH/boot/vmlinuz-"* 2>/dev/null | head -n1)
+  if [[ -n "$kernel_file" ]]; then
+    basename "$kernel_file" | sed 's/vmlinuz-//'
+  else
+    echo "unknown"
+  fi
+}
+
+cleanup() {
+  if [[ $NO_CLEANUP = true ]]; then
+    echo -e "${YELLOW}No cleanup specified. Make sure to manually clean mounts.${RESET}" 1>&2
+    exit 100
+  fi
+
+  echo "Cleaning Mounts"
+
+  umount -lf "${MOUNT_PATH}/boot/efi" 2>/dev/null || true
+  umount -lf "${MOUNT_PATH}/boot" 2>/dev/null || true
+  umount -lf "${MOUNT_PATH}" 2>/dev/null || true
+
+  vgchange -a n $VGROUP
+  echo -e "${GREEN}Clean.${RESET}"
+  losetup -D
+}
+
+main

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