default Java->Temurin21, default debuglevel on (#2033)

* default Java->Temurin21, default debuglevel on
* add --force-confnew to another apt upgrade

Signed-off-by: Markus Storm <markus.storm@gmx.net>

Author: mstormi

build-image/openhabian.conf

@@ -57,14 +57,14 @@ clonebranch=openHAB
 
 # debug verbosity mode
 # off, on (verbose output in log) or maximum (show every command)
-debugmode=off
+debugmode=on
 
 # apt timeout to wait for lock with multiple install actions going on
 apttimeout=60
 
 # Java version to install
 # Valid arguments: 17, 21, Temurin17, Temurin21, 11 (legacy)
-java_opt=17
+java_opt=Temurin21
 
 # fake hardware
 # force treating your box as if it was a ...

functions/system.bash

@@ -34,9 +34,9 @@ system_upgrade() {
   export DEBIAN_FRONTEND=noninteractive
   if ! apt-get clean --yes -o DPkg::Lock::Timeout="$APTTIMEOUT"; then echo "FAILED"; return 1; fi
   # bad packages may require interactive input despite of this setting so do not mask output (no cond_redirect)
-  if ! apt-get upgrade --yes -o DPkg::Lock::Timeout="$APTTIMEOUT" -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold"; then echo "FAILED"; return 1; fi
+  if ! apt-get upgrade --yes --force-confnew -o DPkg::Lock::Timeout="$APTTIMEOUT" -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold"; then echo "FAILED"; return 1; fi
   if ! cond_redirect java -version &> /dev/null; then
-    update_config_java "17" && java_install "17"
+    update_config_java "Temurin21" && java_install "Temurin21"
   fi
   unset DEBIAN_FRONTEND
 }

openhabian-setup.sh

@@ -107,7 +107,7 @@ if [[ -n "$UNATTENDED" ]]; then
   misc_system_settings
   add_admin_ssh_key
   firemotd_setup
-  java_install "${java_opt:-17}"
+  java_install "${java_opt:-Temurin21}"
   openhab_setup "release" "${openhabpkgversion}"
   import_openhab_config
   openhab_shell_interfaces && setup_tailscale