mirror of
https://github.com/MacRimi/ProxMenux.git
synced 2025-06-28 04:06:54 +00:00
Update synology5.sh
This commit is contained in:
parent
dd44e320b6
commit
75d3b30a26
@ -919,11 +919,26 @@ function create_vm() {
|
||||
|
||||
# Check if UEFI (OVMF) is being used ===================
|
||||
if [[ "$BIOS_TYPE" == *"ovmf"* ]]; then
|
||||
msg_info "Configuring EFI disk"
|
||||
|
||||
EFI_STORAGE=$(select_efi_storage "$VMID")
|
||||
EFI_DISK_ID="efidisk0"
|
||||
msg_info "Configuring EFI disk"
|
||||
EFI_STORAGE=$(select_efi_storage $VMID)
|
||||
EFI_DISK_NAME="vm-${VMID}-disk-efivars"
|
||||
|
||||
# Determine storage type and extension
|
||||
STORAGE_TYPE=$(pvesm status -storage $EFI_STORAGE | awk 'NR>1 {print $2}')
|
||||
case $STORAGE_TYPE in
|
||||
nfs | dir)
|
||||
EFI_DISK_EXT=".raw"
|
||||
EFI_DISK_REF="$VMID/"
|
||||
;;
|
||||
*)
|
||||
EFI_DISK_EXT=""
|
||||
EFI_DISK_REF=""
|
||||
;;
|
||||
esac
|
||||
|
||||
STORAGE_TYPE=$(pvesm status -storage "$EFI_STORAGE" | awk 'NR>1 {print $2}')
|
||||
EFI_DISK_ID="efidisk0"
|
||||
|
||||
if [[ "$STORAGE_TYPE" == "btrfs" || "$STORAGE_TYPE" == "dir" || "$STORAGE_TYPE" == "nfs" ]]; then
|
||||
|
||||
@ -936,6 +951,9 @@ if [[ "$BIOS_TYPE" == *"ovmf"* ]]; then
|
||||
else
|
||||
|
||||
EFI_DISK_NAME="vm-${VMID}-disk-efivars"
|
||||
EFI_DISK_EXT=""
|
||||
EFI_DISK_REF=""
|
||||
|
||||
if pvesm alloc "$EFI_STORAGE" "$VMID" "$EFI_DISK_NAME" 4M >/dev/null 2>&1; then
|
||||
if qm set "$VMID" -$EFI_DISK_ID "$EFI_STORAGE:${EFI_DISK_NAME},pre-enrolled-keys=0" >/dev/null 2>&1; then
|
||||
msg_ok "EFI disk created and configured on ${CL}${BL}$EFI_STORAGE${GN}${CL}"
|
||||
@ -948,8 +966,9 @@ if [[ "$BIOS_TYPE" == *"ovmf"* ]]; then
|
||||
ERROR_FLAG=true
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
fi
|
||||
# ==========================================================
|
||||
|
||||
|
||||
@ -1040,10 +1059,28 @@ if [ "$DISK_TYPE" = "virtual" ]; then
|
||||
|
||||
for i in "${!VIRTUAL_DISKS[@]}"; do
|
||||
IFS=':' read -r STORAGE SIZE <<< "${VIRTUAL_DISKS[$i]}"
|
||||
STORAGE_TYPE=$(pvesm status -storage "$STORAGE" | awk 'NR>1 {print $2}')
|
||||
|
||||
STORAGE_TYPE=$(pvesm status -storage $STORAGE | awk 'NR>1 {print $2}')
|
||||
case $STORAGE_TYPE in
|
||||
nfs | dir)
|
||||
DISK_EXT=".raw"
|
||||
DISK_REF="$VMID/"
|
||||
;;
|
||||
*)
|
||||
DISK_EXT=""
|
||||
DISK_REF=""
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
DISK_NUM=$((i+1))
|
||||
DISK_NAME="vm-${VMID}-disk-${DISK_NUM}${DISK_EXT}"
|
||||
|
||||
|
||||
# Create virtual disk
|
||||
#STORAGE_TYPE=$(pvesm status -storage "$STORAGE" | awk 'NR>1 {print $2}')
|
||||
SATA_ID="sata$i"
|
||||
DISK_NUM=$((i+1))
|
||||
|
||||
if [[ "$STORAGE_TYPE" == "btrfs" || "$STORAGE_TYPE" == "dir" || "$STORAGE_TYPE" == "nfs" ]]; then
|
||||
|
||||
@ -1055,14 +1092,13 @@ if [ "$DISK_TYPE" = "virtual" ]; then
|
||||
fi
|
||||
else
|
||||
|
||||
DISK_NAME="vm-${VMID}-disk-${DISK_NUM}"
|
||||
msg_info "Allocating virtual disk for $STORAGE_TYPE..."
|
||||
if ! pvesm alloc "$STORAGE" "$VMID" "$DISK_NAME" "${SIZE}G" >/dev/null 2>&1; then
|
||||
if ! pvesm alloc "$STORAGE" "$VMID" "$DISK_NAME" "$SIZE"G >/dev/null 2>&1; then
|
||||
msg_error "Failed to allocate virtual disk $DISK_NUM"
|
||||
ERROR_FLAG=true
|
||||
continue
|
||||
fi
|
||||
if ! qm set "$VMID" -$SATA_ID "$STORAGE:$VMID/$DISK_NAME" >/dev/null 2>&1; then
|
||||
if ! qm set "$VMID" -$SATA_ID "$STORAGE:${DISK_REF}$DISK_NAME" >/dev/null 2>&1; then
|
||||
msg_error "Failed to configure virtual disk as $SATA_ID"
|
||||
ERROR_FLAG=true
|
||||
continue
|
||||
@ -1072,14 +1108,13 @@ if [ "$DISK_TYPE" = "virtual" ]; then
|
||||
msg_ok "Configured virtual disk as $SATA_ID, ${SIZE}GB on ${CL}${BL}$STORAGE${CL} ${GN}"
|
||||
|
||||
|
||||
DISK_INFO+="<p>Virtual Disk $DISK_NUM: ${SIZE}GB on ${STORAGE}</p>"
|
||||
CONSOLE_DISK_INFO+="- Virtual Disk $DISK_NUM: ${SIZE}GB on ${STORAGE} ($SATA_ID)\n"
|
||||
# Add information to the description
|
||||
DISK_INFO="${DISK_INFO}<p>Virtual Disk $DISK_NUM: ${SIZE}GB on ${STORAGE}</p>"
|
||||
CONSOLE_DISK_INFO="${CONSOLE_DISK_INFO}- Virtual Disk $DISK_NUM: ${SIZE}GB on ${STORAGE} ($SATA_ID)\n"
|
||||
done
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# HTML description
|
||||
HTML_DESC="<div align='center'>
|
||||
<table style='width: 100%; border-collapse: collapse;'>
|
||||
|
Loading…
x
Reference in New Issue
Block a user