From e98d8049028614cbee51c6e18be65107209d92bd Mon Sep 17 00:00:00 2001 From: MacRimi Date: Sun, 29 Jun 2025 15:40:36 +0200 Subject: [PATCH] update menu nas --- scripts/vm/select_nas_iso.sh | 22 +++++++++++++++------- scripts/vm/vm_configurator.sh | 18 +++++++++++++----- 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/scripts/vm/select_nas_iso.sh b/scripts/vm/select_nas_iso.sh index 92b43da..b6760a2 100644 --- a/scripts/vm/select_nas_iso.sh +++ b/scripts/vm/select_nas_iso.sh @@ -44,10 +44,11 @@ function select_nas_iso() { "2" "TrueNAS SCALE VM (Fangtooth)" "3" "TrueNAS CORE VM (FreeBSD based)" "4" "OpenMediaVault VM (Debian based)" - "5" "Rockstor VM (openSUSE based)" - "6" "ZimaOS VM (R0GGER proxmox-zimaos)" - "7" "Umbrel OS VM (Helper Scripts)" - "8" "$(translate "Return to Main Menu")" + "5" "XigmaNAS VM (FreeBSD based)" + "6" "Rockstor VM (openSUSE based)" + "7" "ZimaOS VM (R0GGER proxmox-zimaos)" + "8" "Umbrel OS VM (Helper Scripts)" + "9" "$(translate "Return to Main Menu")" ) local NAS_TYPE @@ -88,13 +89,20 @@ function select_nas_iso() { HN="OpenMediaVault" ;; 5) + ISO_NAME="XigmaNAS-13.3.0.5" + ISO_URL="https://sourceforge.net/projects/xigmanas/files/XigmaNAS-13.3.0.5/13.3.0.5.10153/XigmaNAS-x64-LiveCD-13.3.0.5.10153.iso/download" + ISO_FILE="XigmaNAS-x64-LiveCD-13.3.0.5.10153.iso" + ISO_PATH="$ISO_DIR/$ISO_FILE" + HN="XigmaNAS" + ;; + 6) ISO_NAME="Rockstor" ISO_URL="https://rockstor.com/downloads/installer/leap/15.6/x86_64/Rockstor-Leap15.6-generic.x86_64-5.0.15-0.install.iso" ISO_FILE="Rockstor-Leap15.6-generic.x86_64-5.0.15-0.install.iso" ISO_PATH="$ISO_DIR/$ISO_FILE" HN="Rockstor" ;; - 6) + 7) HN="ZimaOS-VM" if ! confirm_vm_creation; then return 1 @@ -109,7 +117,7 @@ function select_nas_iso() { return 1 ;; - 7) + 8) HN="Umbrel OS" bash -c "$(wget -qLO - https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/vm/umbrel-os-vm.sh)" echo -e @@ -127,7 +135,7 @@ function select_nas_iso() { return 1 ;; - 8) + 9) return 1 ;; esac diff --git a/scripts/vm/vm_configurator.sh b/scripts/vm/vm_configurator.sh index 758ebb5..afe01d3 100644 --- a/scripts/vm/vm_configurator.sh +++ b/scripts/vm/vm_configurator.sh @@ -95,6 +95,10 @@ function load_default_vm_config() { ;; esac + if [[ "$os_type" == "1" && "$HN" == "OpenMediaVault" ]]; then + BIOS_TYPE=" -bios seabios" + fi + [[ -z "$CORE_COUNT" ]] && CORE_COUNT="2" [[ -z "$RAM_SIZE" ]] && RAM_SIZE="4096" @@ -166,11 +170,15 @@ function configure_vm_advanced() { [[ "$MACHINE_TYPE" == "q35" ]] && MACHINE=" -machine q35" && FORMAT="" || MACHINE="" && FORMAT=",efitype=4m" # BIOS - BIOS=$(whiptail --backtitle "ProxMenux" --title "$(translate "BIOS Type")" \ - --radiolist "$(translate "Choose BIOS type")" 10 60 2 \ - "ovmf" "UEFI (OVMF)" ON \ - "seabios" "Legacy BIOS (SeaBIOS)" OFF 3>&1 1>&2 2>&3) || return 1 - BIOS_TYPE=" -bios $BIOS" + if [[ "$HN" == "OpenMediaVault" ]]; then + BIOS_TYPE=" -bios seabios" + else + BIOS=$(whiptail --backtitle "ProxMenux" --title "$(translate "BIOS Type")" \ + --radiolist "$(translate "Choose BIOS type")" 10 60 2 \ + "ovmf" "UEFI (OVMF)" ON \ + "seabios" "Legacy BIOS (SeaBIOS)" OFF 3>&1 1>&2 2>&3) || return 1 + BIOS_TYPE=" -bios $BIOS" + fi # CPU Type # CPU_CHOICE=$(whiptail --backtitle "ProxMenux" --title "$(translate "CPU Model")" \