Merge remote-tracking branch 'upstream/main'

misc/build.func

@@ -191,7 +191,6 @@ base_settings() {
   GATE=""
   APT_CACHER=""
   APT_CACHER_IP=""
-  #DISABLEIP6="no"
   MTU=""
   SD=""
   NS=""
@@ -235,25 +234,30 @@ CT_TYPE="${CT_TYPE}"
 DISK_SIZE="${DISK_SIZE}"
 CORE_COUNT="${CORE_COUNT}"
 RAM_SIZE="${RAM_SIZE}"
+VERBOSE="${VERBOSE}"
+PW="${PW##-password }"
+#CT_ID=$NEXTID
 HN="${HN}"
 BRG="${BRG}"
+NET="${NET}"
+IPV6_METHOD="${IPV6_METHOD:-none}"
+# Set this only if using "IPV6_METHOD=static"
+#IPV6STATIC="fd00::1234/64"
+
+GATE="${GATE:-none}"
 APT_CACHER_IP="${APT_CACHER_IP:-none}"
-DISABLEIP6=""
-PW='${PW:-none}'
+MTU="${MTU:-1500}"
+SD="${SD:-none}"
+NS="${NS:-none}"
+MAC="${MAC:-none}"
+VLAN="${VLAN:-none}"
 SSH="${SSH}"
 SSH_AUTHORIZED_KEY="${SSH_AUTHORIZED_KEY}"
-VERBOSE="${VERBOSE}"
 TAGS="${TAGS:-none}"
-VLAN="${VLAN:-none}"
-MTU="${MTU:-1500}"
-GATE="${GATE:-none}"
-SD="${SD:-none}"
-MAC="${MAC:-none}"
-NS="${NS:-none}"
-NET="${NET}"
-FUSE="${ENABLE_FUSE}"
-
+ENABLE_FUSE="$ENABLE_FUSE"
+ENABLE_TUN="$ENABLE_TUN"
 EOF
+
       echo -e "${INFO}${BOLD}${GN}Writing configuration to ${FILEPATH}${CL}"
     else
       echo -e "${INFO}${BOLD}${RD}Configuration file already exists at ${FILEPATH}${CL}"
@@ -267,24 +271,29 @@ CT_TYPE="${CT_TYPE}"
 DISK_SIZE="${DISK_SIZE}"
 CORE_COUNT="${CORE_COUNT}"
 RAM_SIZE="${RAM_SIZE}"
+VERBOSE="${VERBOSE}"
+PW="${PW##-password }"
+#CT_ID=$NEXTID
 HN="${HN}"
 BRG="${BRG}"
+NET="${NET}"
+IPV6_METHOD="${IPV6_METHOD:-none}"
+
+# Set this only if using "IPV6_METHOD=static"
+#IPV6STATIC="fd00::1234/64"
+
+GATE="${GATE:-none}"
 APT_CACHER_IP="${APT_CACHER_IP:-none}"
-DISABLEIP6=""
-PW='${PW:-none}'
+MTU="${MTU:-1500}"
+SD="${SD:-none}"
+NS="${NS:-none}"
+MAC="${MAC:-none}"
+VLAN="${VLAN:-none}"
 SSH="${SSH}"
 SSH_AUTHORIZED_KEY="${SSH_AUTHORIZED_KEY}"
-VERBOSE="${VERBOSE}"
 TAGS="${TAGS:-none}"
-VLAN="${VLAN:-none}"
-MTU="${MTU:-1500}"
-GATE="${GATE:-none}"
-SD="${SD:-none}"
-MAC="${MAC:-none}"
-NS="${NS:-none}"
-NET="${NET}"
-FUSE="${ENABLE_FUSE}"
-
+ENABLE_FUSE="$ENABLE_FUSE"
+ENABLE_TUN="$ENABLE_TUN"
 EOF
         echo -e "${INFO}${BOLD}${GN}Writing configuration to ${FILEPATH}${CL}"
       else
@@ -666,13 +675,6 @@ advanced_settings() {
     fi
   fi
 
-  # if (whiptail --backtitle "Proxmox VE Helper Scripts" --defaultno --title "IPv6" --yesno "Disable IPv6?" 10 58); then
-  #   DISABLEIP6="yes"
-  # else
-  #   DISABLEIP6="no"
-  # fi
-  # echo -e "${DISABLEIPV6}${BOLD}${DGN}Disable IPv6: ${BGN}$DISABLEIP6${CL}"
-
   if MTU1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set Interface MTU Size (leave blank for default [The MTU of your selected vmbr, default is 1500])" 8 58 --title "MTU SIZE" 3>&1 1>&2 2>&3); then
     if [ -z "$MTU1" ]; then
       MTU1="Default"
@@ -814,7 +816,6 @@ DIAGNOSTICS=yes
 #"ram_size"
 #"os_type"
 #"os_version"
-#"disableip6"
 #"nsapp"
 #"method"
 #"pve_version"
@@ -841,7 +842,6 @@ DIAGNOSTICS=no
 #"ram_size"
 #"os_type"
 #"os_version"
-#"disableip6"
 #"nsapp"
 #"method"
 #"pve_version"
@@ -873,20 +873,24 @@ install_script() {
   header_info
   while true; do
 
-    CHOICE=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "SETTINGS" --menu "Choose an option:" \
-      18 60 6 \
+    TMP_CHOICE=$(whiptail --backtitle "Proxmox VE Helper Scripts" \
+      --title "SETTINGS" \
+      --menu "Choose an option:" 20 60 6 \
       "1" "Default Settings" \
       "2" "Default Settings (with verbose)" \
       "3" "Advanced Settings" \
       "4" "Use Config File" \
       "5" "Diagnostic Settings" \
-      "6" "Exit" --nocancel --default-item "1" 3>&1 1>&2 2>&3)
+      "6" "Exit" \
+      --default-item "1" 3>&1 1>&2 2>&3) || true
 
-    if [ $? -ne 0 ]; then
-      echo -e "${CROSS}${RD} Menu canceled. Exiting.${CL}"
+    if [ -z "$TMP_CHOICE" ]; then
+      echo -e "\n${CROSS}${RD}Menu canceled. Exiting script.${CL}\n"
       exit 0
     fi
 
+    CHOICE="$TMP_CHOICE"
+
     case $CHOICE in
     1)
       header_info
@@ -941,11 +945,11 @@ install_script() {
 
       ;;
     6)
-      echo -e "${CROSS}${RD}Exiting.${CL}"
+      echo -e "\n${CROSS}${RD}Script terminated. Have a great day!${CL}\n"
       exit 0
       ;;
     *)
-      echo -e "${CROSS}${RD}Invalid option, please try again.${CL}"
+      echo -e "\n${CROSS}${RD}Invalid option, please try again.${CL}\n"
       ;;
     esac
   done
@@ -1070,7 +1074,6 @@ build_container() {
   export CACHER="$APT_CACHER"
   export CACHER_IP="$APT_CACHER_IP"
   export tz="$timezone"
-  #export DISABLEIPV6="$DISABLEIP6"
   export APPLICATION="$APP"
   export app="$NSAPP"
   export PASSWORD="$PW"

misc/config-file.func

@@ -269,6 +269,7 @@ config_file() {
     if [ "$NET" == "dhcp" ]; then
       echo -e "${NETWORK}${BOLD}${DGN}IP Address: ${BGN}DHCP${CL}"
       echo -e "${GATEWAY}${BOLD}${DGN}Gateway IP Address: ${BGN}Default${CL}"
+      GATE=""
     elif [[ "$NET" =~ $ip_cidr_regex ]]; then
       echo -e "${NETWORK}${BOLD}${DGN}IP Address: ${BGN}$NET${CL}"
       if [ ! -z "$GATE" ]; then
@@ -446,6 +447,22 @@ config_file() {
     fi
   fi
 
+  if [[ "$IPV6_METHOD" == "static" ]]; then
+    if [[ -n "$IPV6STATIC" ]]; then
+      IP6=",ip6=${IPV6STATIC}"
+      echo -e "${NETWORK}${BOLD}${DGN}IPv6 Address: ${BGN}${IPV6STATIC}${CL}"
+    else
+      msg_error "IPV6_METHOD is set to static but IPV6STATIC is empty"
+      exit
+    fi
+  elif [[ "$IPV6_METHOD" == "auto" ]]; then
+    IP6=",ip6=auto"
+    echo -e "${NETWORK}${BOLD}${DGN}IPv6 Address: ${BGN}auto${CL}"
+  else
+    IP6=""
+    echo -e "${NETWORK}${BOLD}${DGN}IPv6 Address: ${BGN}none${CL}"
+  fi
+
   if [[ -n "${SD-}" ]]; then
     if [[ "$SD" == "none" ]]; then
       SD=""
@@ -622,6 +639,24 @@ config_file() {
     echo -e "${FUSE}${BOLD}${DGN}Enable FUSE: ${BGN}$ENABLE_FUSE${CL}"
   fi
 
+  if [[ -n "$ENABLE_TUN" ]]; then
+    if [[ "$ENABLE_TUN" == "yes" ]]; then
+      echo -e "${FUSE}${BOLD}${DGN}Enable TUN: ${BGN}Yes${CL}"
+    elif [[ "$ENABLE_TUN" == "no" ]]; then
+      echo -e "${FUSE}${BOLD}${DGN}Enable TUN: ${BGN}No${CL}"
+    else
+      msg_error "Enable TUN needs to be 'yes' or 'no', was ${ENABLE_TUN}"
+      exit
+    fi
+  else
+    if (whiptail --backtitle "Proxmox VE Helper Scripts" --defaultno --title "TUN" --yesno "Enable TUN?" 10 58); then
+      ENABLE_TUN="yes"
+    else
+      ENABLE_TUN="no"
+    fi
+    echo -e "${FUSE}${BOLD}${DGN}Enable TUN: ${BGN}$ENABLE_TUN${CL}"
+  fi
+
   if [[ -n "${VERBOSE-}" ]]; then
     if [[ "$VERBOSE" == "yes" ]]; then
       echo -e "${SEARCH}${BOLD}${DGN}Verbose Mode: ${BGN}$VERBOSE${CL}"

misc/tools.func

@@ -1766,6 +1766,7 @@ function setup_ffmpeg() {
       libx264-dev libx265-dev libvpx-dev libmp3lame-dev
       libfreetype6-dev libass-dev libopus-dev libvorbis-dev
       libdav1d-dev libsvtav1-dev zlib1g-dev libnuma-dev
+      libva-dev libdrm-dev
     )
     ;;
   *)
@@ -1802,6 +1803,7 @@ function setup_ffmpeg() {
 
   if [[ "$TYPE" == "full" ]]; then
     args+=(--enable-libx265 --enable-libdav1d --enable-zlib)
+    args+=(--enable-vaapi --enable-libdrm)
   fi
 
   if [[ ${#args[@]} -eq 0 ]]; then