Merge pull request #5 from syself/tg/merge-upstream-into-fork

🌱 Merge changes from upstream into our fork

Author: guettli

config.sh

@@ -88,16 +88,14 @@ export OSMENULIST+=(
   "Custom image"  "(Config for custom images)"
 )
 
-export PROXMOX4_BASE_IMAGE="Debian-811-jessie-64-minimal"
-export PROXMOX5_BASE_IMAGE="Debian-913-stretch-64-minimal"
-export PROXMOX6_BASE_IMAGE="Debian-1013-buster-64-minimal"
-export PROXMOX7_BASE_IMAGE="Debian-1107-bullseye-amd64-base"
+export PROXMOX7_BASE_IMAGE="Debian-bullseye-latest-amd64-base"
+export PROXMOX8_BASE_IMAGE="Debian-bookworm-latest-amd64-base"
 
 export CPANEL_INSTALLER_SRC=http://mirror.hetzner.com/tools/cpanelinc/cpanel
 
 export PLESK_INSTALLER_SRC=http://mirror.hetzner.com/tools/parallels/plesk
 export PLESK_MIRROR=http://mirror.hetzner.com/plesk
-export PLESK_STD_VERSION=PLESK_18_0_53
+export PLESK_STD_VERSION=PLESK_18_0_57
 export PLESK_DOWNLOAD_RETRY_COUNT=999
 export PLESK_COMPONENTS=(
   awstats
@@ -144,9 +142,8 @@ export ARCHLINUX_BOOTSTRAP="$ARCHLINUX_DIR/archlinux-bootstrap-latest-x86_64.tar
 
 other_images() {
   find "$IMAGESPATH"/ -maxdepth 1 -type f -name "CoreOS*" -a -not -name "*.sig" -printf '%f\n'
+  echo 'Proxmox-Virtualization-Environment-on-Debian-Bookworm'
   echo 'Proxmox-Virtualization-Environment-on-Debian-Bullseye'
-  echo 'Proxmox-Virtualization-Environment-on-Debian-Buster'
-  echo 'Proxmox-Virtualization-Environment-on-Debian-Stretch'
   find "$IMAGESPATH/" -maxdepth 1 -type f -iname '*beta*' -a -not -name '*.sig' -printf '%f\n'
 }
 

configs/proxmox6

@@ -17,4 +17,4 @@ PART  lvm    vg0    all
 LV  vg0  root  /     ext4  15G
 LV  vg0  swap  swap  swap   6G
 
-IMAGE /root/images/Debian-1107-bullseye-amd64-base.tar.gz
+IMAGE /root/images/Debian-bullseye-latest-amd64-base.tar.gz

configs/proxmox7

@@ -1,4 +1,3 @@
-
 ## ===================================================
 ##  Hetzner Online GmbH - installimage  -  Proxmox-VE
 ## ===================================================
@@ -18,4 +17,4 @@ PART  lvm    vg0    all
 LV  vg0  root  /     ext4  15G
 LV  vg0  swap  swap  swap   6G
 
-IMAGE /root/images/Debian-913-stretch-64-minimal.tar.gz
+IMAGE /root/images/Debian-bookworm-latest-amd64-base.tar.gz

configs/proxmox5 renamed to configs/proxmox8

@@ -8,10 +8,10 @@ SWRAIDLEVEL 1
 
 BOOTLOADER grub
 
-HOSTNAME Debian-1101-bullseye-amd64-base
+HOSTNAME Debian-stable-amd64-base
 
 PART swap swap 8G
 PART /boot ext3 1024M
 PART /    ext4 all
 
-IMAGE /root/images/Debian-1106-bullseye-amd64-base.tar.gz
+IMAGE /root/images/Debian-stable-amd64-base.tar.gz

configs/simple-debian64-noraid

@@ -7,10 +7,10 @@ SWRAIDLEVEL 1
 
 BOOTLOADER grub
 
-HOSTNAME Debian-1101-bullseye-amd64-base
+HOSTNAME Debian-stable-amd64-base
 
 PART swap swap 2G
 PART /boot ext3 1024M
 PART /     ext4 all
 
-IMAGE /root/images/Debian-1106-bullseye-amd64-base.tar.gz
+IMAGE /root/images/Debian-stable-amd64-base.tar.gz

configs/simple-debian64-raid

@@ -7,12 +7,12 @@ SWRAIDLEVEL 1
 
 BOOTLOADER grub
 
-HOSTNAME Debian-1101-bullseye-amd64-base
+HOSTNAME Debian-stable-amd64-base
 
 PART /boot ext3 1024M
 PART lvm   vg0   all
 
 LV vg0 root /    ext4  20G
 LV vg0 swap swap swap   4G
 
-IMAGE /root/images/Debian-1106-bullseye-amd64-base.tar.gz
+IMAGE /root/images/Debian-stable-amd64-base.tar.gz

configs/simple-debian64-raid-lvm

@@ -3,7 +3,7 @@
 #
 # cpanel functions
 #
-# (c) 2008-2018, Hetzner Online GmbH
+# (c) 2008-2024, Hetzner Online GmbH
 #
 
 # is_cpanel_install()
@@ -121,6 +121,11 @@ prevent_outdated_keyring_issues() {
   execute_chroot_command 'yum makecache'
 }
 
+install_ubuntu_2004_cpanel_depenencies() {
+  execute_chroot_command 'apt-get update' || return 1
+  execute_chroot_command 'apt-get -y install dirmngr libfindbin-libs-perl' || return 1
+}
+
 # install_cpanel()
 install_cpanel() {
   if [[ "$IAM" == 'almalinux' ]]; then
@@ -139,8 +144,14 @@ install_cpanel() {
   chmod a+x "${FOLD}/hdd/${temp_file}"
   debug 'downloaded cpanel installer'
 
-  execute_chroot_command 'yum check-update' # || return 1
-  execute_chroot_command 'yum -y install yum-utils' || return 1
+  if rhel_based_image; then
+    execute_chroot_command 'yum check-update' # || return 1
+    execute_chroot_command 'yum -y install yum-utils' || return 1
+  fi
+
+  if [[ "$IAM" == 'ubuntu' ]] && (( IMG_VERSION == 2004 )); then
+    install_ubuntu_2004_cpanel_depenencies || return 1
+  fi
 
   if [[ -e "$FOLD/hdd/usr/bin/needs-restarting" ]]; then
     mv "$FOLD/hdd/usr/bin/needs-restarting" "$FOLD/hdd/usr/bin/needs-restarting.bak"
@@ -156,6 +167,7 @@ install_cpanel() {
   if installed_os_uses_systemd && ! systemd_nspawn_booted; then
     boot_systemd_nspawn || return 1
   fi
+
   execute_command "${command}" || return 1
   systemd_nspawn_booted && poweroff_systemd_nspawn
 

cpanel.functions.sh

@@ -3,7 +3,7 @@
 #
 # functions
 #
-# (c) 2007-2022, Hetzner Online GmbH
+# (c) 2007-2024, Hetzner Online GmbH
 #
 
 
@@ -179,9 +179,8 @@ generate_menu() {
   case $IMAGENAME in
     Proxmox-Virtualization-Environment*)
       case "$IMAGENAME" in
+        Proxmox-Virtualization-Environment-on-Debian-Bookworm) export PROXMOX_VERSION="8" ;;
         Proxmox-Virtualization-Environment-on-Debian-Bullseye) export PROXMOX_VERSION="7" ;;
-        Proxmox-Virtualization-Environment-on-Debian-Buster) export PROXMOX_VERSION="6" ;;
-        Proxmox-Virtualization-Environment-on-Debian-Stretch) export PROXMOX_VERSION="5" ;;
       esac
       cp "$SCRIPTPATH/post-install/proxmox$PROXMOX_VERSION" /post-install
       chmod 0755 /post-install
@@ -811,7 +810,7 @@ if [ -n "$1" ]; then
   done < /tmp/part_lines.tmp
 
   # get encryption password
-  CRYPTPASSWORD="$(grep -e '^CRYPTPASSWORD ' "$1")"
+  CRYPTPASSWORD="$(grep -m 1 '^CRYPTPASSWORD ' "$1" | cut -d ' ' -f 2- | sed -z 's/\n$//')"
 
   # get LVM volume group config
   LVM_VG_COUNT="$(egrep -c '^PART *lvm ' "$1")"
@@ -958,6 +957,11 @@ if [ -n "$1" ]; then
   fi
   # keep dell_r6415 default
   (( use_kernel_mode_setting_given == 0 )) && is_dell_r6415 && USE_KERNEL_MODE_SETTING=1
+
+  # set n to disable kms
+  if [[ "$(tac "$1" | grep -m1 ^USE_KERNEL_MODE_SETTING | awk '{print $2}')" =~ ^n ]]; then
+    export USE_KERNEL_MODE_SETTING=0
+  fi
 fi
 
   :
@@ -1632,7 +1636,7 @@ validate_vars() {
   fi
 
   if is_cpanel_install; then
-    if [ "$IAM" != "centos" -a "$IAM" != "almalinux" ]; then
+    if [ "$IAM" != "centos" -a "$IAM" != "almalinux" -a "$IAM" != "ubuntu" ]; then
       graph_error "ERROR: CPANEL is not available for this image"
       return 1
     fi
@@ -2211,11 +2215,7 @@ make_fstab_entry() {
   elif [[ "$3" =~ ^btrfs\.[0-9A-Za-z]+ ]] ; then
     ENTRY="# $1$p$2  belongs to btrfs volume '$3'"
   else
-    if [ "$SYSTYPE" = "vServer" -a "$4" = 'ext4' ]; then
-      ENTRY="$1$p$2 $3 $4 defaults,discard 0 0"
-    else
-      ENTRY="$1$p$2 $3 $4 defaults 0 0"
-    fi
+    ENTRY="$1$p$2 $3 $4 defaults 0 0"
   fi
 
   if [ "$5" = "crypt" ]; then
@@ -2587,7 +2587,7 @@ format_partitions() {
 encrypt_partitions() {
   if [ "$1" -a "$2" ]; then
     local fstab="$1"
-    local cryptpassword="$(echo "$2" | awk '{print $2}')"
+    local cryptpassword="$2"
     local dev
     local dev_uuid
 
@@ -2600,9 +2600,9 @@ encrypt_partitions() {
         else
           dev="$(echo "$line" | grep "crypted" | awk '{print $1}')"
         fi
-        echo -n "${cryptpassword}" | cryptsetup --cipher aes-xts-plain64 --key-size 256 --hash sha256 --iter-time 6000 --batch-mode luksFormat "$dev" -
+        cryptsetup --cipher aes-xts-plain64 --key-size 256 --hash sha256 --iter-time 6000 --batch-mode luksFormat "$dev" <<< "$cryptpassword"
         dev_uuid=$(blkid $dev -o value -s UUID)
-        echo -n "${cryptpassword}" | cryptsetup --batch-mode luksOpen "$dev" "luks-${dev_uuid}" -
+        cryptsetup --batch-mode luksOpen "$dev" "luks-${dev_uuid}" <<< "$cryptpassword"
         touch "$FOLD/crypttab"
         echo "luks-${dev_uuid} UUID=${dev_uuid} none luks" >> "$FOLD/crypttab"
         sed -i -e "s+$dev+/dev/mapper/luks-${dev_uuid}+g" "$FOLD/fstab"
@@ -4163,4 +4163,35 @@ is_usb_disk() {
   echo "$udevadm_info" | grep --quiet 'ID_USB_DRIVER=usb-storage'
 }
 
+free_port_53() {
+  systemctl -q is-active systemd-resolved || return
+
+  debug '# stopping rescue system systemd-resolved'
+
+  systemctl stop systemd-resolved || return 1
+
+  debug '# updating /etc/resolv.conf'
+
+  if [[ -L /etc/resolv.conf ]]; then
+    mv -v /etc/resolv.con{f,f.bak} | debugoutput
+  else
+    cp -v /etc/resolv.con{f,f.bak} | debugoutput
+  fi
+
+  {
+    while read nsaddr; do
+      echo "nameserver $nsaddr"
+    done < <(randomized_nsaddrs)
+  } > /etc/resolv.conf
+
+  diff -Naur /etc/resolv.con{f.bak,f} | debugoutput
+
+  debug '# updating /run/systemd/resolve/stub-resolv.conf'
+
+  cp /run/systemd/resolve/stub-resolv.con{f,f.bak}
+  cp /etc/resolv.conf /run/systemd/resolve/stub-resolv.conf
+
+  diff -Naur /run/systemd/resolve/stub-resolv.con{f.bak,f} | debugoutput
+}
+
 # vim: ai:ts=2:sw=2:et

functions.sh

@@ -3,7 +3,7 @@
 #
 # imageinfo functions
 #
-# (c) 2019-2022, Hetzner Online GmbH
+# (c) 2019-2024, Hetzner Online GmbH
 #
 
 debian_buster_image() {
@@ -71,4 +71,18 @@ image_requires_xfs_version_check() {
   return 1
 }
 
+image_i40e_driver_version() {
+  [[ "$(modinfo -F vermagic "$FOLD/hdd/lib/modules/"*'/kernel/drivers/net/ethernet/intel/i40e/i40e.ko' 2> /dev/null)" =~ ^([0-9]+\.[0-9]+)[^0-9] ]] || return
+  echo "${BASH_REMATCH[1]}"
+}
+
+image_i40e_driver_version_ge() {
+  local other="$1"
+  [[ "$(echo -e "$(image_i40e_driver_version)\n$other" | sort -V | head -n 1)" == "$other" ]]
+}
+
+image_i40e_driver_exposes_port_name() {
+  image_i40e_driver_version_ge '6.7'
+}
+
 # vim: ai:ts=2:sw=2:et

imageinfo.functions.sh

@@ -10,10 +10,8 @@
 
 # simple params - restart with other params
 case $1 in
-  proxmox4)             exec "$0" -c proxmox4 -x proxmox4 ;;
-  proxmox5)             exec "$0" -c proxmox5 -x proxmox5 ;;
-  proxmox6)             exec "$0" -c proxmox6 -x proxmox6 ;;
   proxmox7)             exec "$0" -c proxmox7 -x proxmox7 ;;
+  proxmox8)             exec "$0" -c proxmox8 -x proxmox8 ;;
   hsa-baculadir)        exec "$0" -c hsa-baculadir -x hsa-baculadir ;;
   hsa-minimal64)        exec "$0" -c hsa-minimal64 -x hsa-minimal64 ;;
   hsa-managed)          exec "$0" -c hsa-managed -x hsa-managed ;;
@@ -113,6 +111,7 @@ if [ $EXITCODE -ne 0 ] ; then
   exit 1
 fi
 
+free_port_53
 
 # check if we have a autosetup-file, else we start the menu
 if [ -e "$AUTOSETUPCONFIG" ] ; then

installimage

@@ -26,6 +26,19 @@ board_requires_drm_blacklisting() {
     [[ "$(board_vendor)" == 'ASUSTeK COMPUTER INC.' ]] &&
     [[ "$(board_name)" == 'PRIME B760M-A D4' ]] &&
     return 0
+  [[ "$IAM" == ubuntu ]] &&
+    ((IMG_VERSION == 2004)) &&
+    hwe_image &&
+    [[ "$(board_vendor)" == 'ASUSTeK COMPUTER INC.' ]] &&
+    [[ "$(board_name)" == 'PRIME B760M-A D4' ]] &&
+    return 0
+  {
+    { [[ "$IAM" == debian ]] && ((IMG_VERSION < 1300)) } ||
+    { [[ "$IAM" == ubuntu ]] && ((IMG_VERSION < 2204)) }
+  } &&
+    [[ "$(board_vendor)" == 'Gigabyte Technology Co., Ltd.' ]] &&
+    has_b360hd3p_board &&
+    return 0
   return 1
 }
 
@@ -43,6 +56,10 @@ buggy_kernel_modules() {
 
 blacklist_unwanted_and_buggy_kernel_modules() {
   local blacklist_conf="$FOLD/hdd/etc/modprobe.d/blacklist-$C_SHORT.conf"
+
+  # skip if virtual machine
+  is_virtual_machine && return
+
   debug '# blacklisting unwanted and buggy kernel modules'
   {
     echo "### $COMPANY - installimage"
@@ -63,6 +80,8 @@ configure_kernel_modules() {
 
   # skip if drm is blacklisted
   board_requires_drm_blacklisting && return
+  # skip if virtual machine
+  is_virtual_machine && return
 
   debug '# configuring kernel modules'
   {