diff --git a/vm/haos-vm.sh b/vm/haos-vm.sh index 8e9e61cc..8bcb926c 100644 --- a/vm/haos-vm.sh +++ b/vm/haos-vm.sh @@ -184,8 +184,8 @@ function exit-script() { function default_settings() { BRANCH="$stable" VMID=$(get_valid_nextid) - FORMAT=",efitype=4m" - MACHINE="" + FORMAT=",efitype=4m,pre-enrolled-keys=0" + MACHINE=" -machine q35" DISK_CACHE="cache=writethrough," HN="haos$stable" CPU_TYPE=" -cpu host" @@ -198,11 +198,11 @@ function default_settings() { START_VM="yes" METHOD="default" echo -e "${CONTAINERID}${BOLD}${DGN}Virtual Machine ID: ${BGN}${VMID}${CL}" - echo -e "${CONTAINERTYPE}${BOLD}${DGN}Machine Type: ${BGN}i440fx${CL}" + echo -e "${CONTAINERTYPE}${BOLD}${DGN}Machine Type: ${BGN}q35${CL}" echo -e "${DISKSIZE}${BOLD}${DGN}Disk Size: ${BGN}${DISK_SIZE}${CL}" - echo -e "${DISKSIZE}${BOLD}${DGN}Disk Cache: ${BGN}None${CL}" + echo -e "${DISKSIZE}${BOLD}${DGN}Disk Cache: ${BGN}Write Through${CL}" echo -e "${HOSTNAME}${BOLD}${DGN}Hostname: ${BGN}${HN}${CL}" - echo -e "${OS}${BOLD}${DGN}CPU Model: ${BGN}KVM64${CL}" + echo -e "${OS}${BOLD}${DGN}CPU Model: ${BGN}Host${CL}" echo -e "${CPUCORE}${BOLD}${DGN}CPU Cores: ${BGN}${CORE_COUNT}${CL}" echo -e "${RAMSIZE}${BOLD}${DGN}RAM Size: ${BGN}${RAM_SIZE}${CL}" echo -e "${BRIDGE}${BOLD}${DGN}Bridge: ${BGN}${BRG}${CL}" @@ -246,16 +246,16 @@ function advanced_settings() { done if MACH=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "MACHINE TYPE" --radiolist --cancel-button Exit-Script "Choose Type" 10 58 2 \ - "i440fx" "Machine i440fx" ON \ - "q35" "Machine q35" OFF \ + "i440fx" "Machine i440fx" OFF \ + "q35" "Machine q35" ON \ 3>&1 1>&2 2>&3); then if [ $MACH = q35 ]; then echo -e "${CONTAINERTYPE}${BOLD}${DGN}Machine Type: ${BGN}$MACH${CL}" - FORMAT="" + FORMAT=",efitype=4m,pre-enrolled-keys=0" MACHINE=" -machine q35" else echo -e "${CONTAINERTYPE}${BOLD}${DGN}Machine Type: ${BGN}$MACH${CL}" - FORMAT=",efitype=4m" + FORMAT=",efitype=4m,pre-enrolled-keys=0" MACHINE="" fi else @@ -486,7 +486,7 @@ btrfs | local-zfs) DISK_EXT=".raw" DISK_REF="$VMID/" DISK_IMPORT="-format raw" - FORMAT=",efitype=4m" + FORMAT=",efitype=4m,pre-enrolled-keys=0" THIN="" ;; esac @@ -507,6 +507,8 @@ qm set $VMID \ -scsi0 ${DISK1_REF},${DISK_CACHE}${THIN}size=32G \ -boot order=scsi0 >/dev/null +qm set $VMID -serial0 socket >/dev/null + DESCRIPTION=$( cat <