Merge remote-tracking branch 'upstream/main'

This commit is contained in:
Sam Heinz
2024-04-25 11:27:36 +10:00
12 changed files with 173 additions and 38 deletions

View File

@@ -98,7 +98,7 @@ pve_check() {
if [ $(pveversion | grep "pve-manager/8" | wc -l) -ne 1 ]; then
whiptail --backtitle "Proxmox VE Helper Scripts" --msgbox --title "Proxmox VE 7 Detected" "You are currently using Proxmox VE 7 (EOL 2024-07), refrain from creating Debian 12 LXCs. \nDefault distribution for $APP LXC is ${var_os} ${var_version}" 10 60
fi
if ! pveversion | grep -Eq "pve-manager/(7.4-[1][3-9]|8.1.[1-9])"; then
if ! pveversion | grep -Eq "pve-manager/(7\.4-(1[3-8])|8\.[1-2])"; then
msg_error "This version of Proxmox Virtual Environment is not supported"
echo -e "Requires PVE7 Version 7.4-13 or later, or PVE8 Version 8.1.1 or later."
echo -e "Exiting..."
@@ -220,17 +220,29 @@ advanced_settings() {
fi
done
if PW1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
if [ -z $PW1 ]; then
PW1="Automatic Login"
PW=""
while true; do
if PW1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
if [[ ! -z "$PW1" ]]; then
if [[ "$PW1" == *" "* ]]; then
whiptail --msgbox "Password cannot contain spaces. Please try again." 8 58
elif [ ${#PW1} -lt 5 ]; then
whiptail --msgbox "Password must be at least 5 characters long. Please try again." 8 58
else
PW="-password $PW1"
echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
break
fi
else
PW1="Automatic Login"
PW=""
echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
break
fi
else
PW="-password $PW1"
exit-script
fi
echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
else
exit-script
fi
done
if CT_ID=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Container ID" 8 58 $NEXTID --title "CONTAINER ID" 3>&1 1>&2 2>&3); then
if [ -z "$CT_ID" ]; then