Fixoffline (#2074)

* remove bad dpkg option --confnew (it is only for apt)
* fix offline build

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

Author: mstormi

build-image/offline-install-modifications.bash

@@ -33,22 +33,24 @@ adoptium_fetch_apt
 
 apt-get --quiet update
 apt-get --quiet upgrade --yes --force-confnew
-apt-get --quiet install --download-only --yes
-  openhab openhab-addons \
+apt-get --quiet install --download-only --yes openhab openhab-addons \
   acl amanda-common amanda-server amanda-client apt-transport-https arping \
   avahi-daemon bash-completion bc bzip2 comitup coreutils curl \
   dnsutils dns-root-data dnsmasq-base dirmngr exim4 fontconfig gdisk git \
-  htop iotop javascript-common jq \
-  libc6 libcairo2 libgudev-1.0-0 libjs-jquery libmbim-glib4 libmbim-proxy \
-  libmm-glib0 libndp0 libnm0 libpixman-1-0 libqmi-glib5 libqmi-proxy libstdc++6 \
-  libteamdctl0 libxcb-render0 libxcb-shm0 libxrender1 \
-  make man-db mc mailutils modemmanager moreutils multitail nano network-manager \
+  htop inetutils-telnet iotop javascript-common jq \
+  libblas3 libc6 libcairo2 libgudev-1.0-0 libjs-jquery libmbim-glib4 libgpm2 \
+  liblinear4 liblua5.4-0 libmbim-proxy \
+  libmm-glib0 libndp0 libnet1 libnm0 libpcre2-32-0 \
+  libpixman-1-0 libqmi-glib5 libqmi-proxy libsodium23i libstdc++6 \
+  libteamdctl0 libxcb-render0 libxcb-shm0 libxrender1 libyascreen0 \
+  make man-db mc mc-data mailcap mailutils modemmanager moreutils multitail \
+  nano network-manager nmap nmap-common \
   python3-blinker python3-cairo python3-click python3-colorama python3-flask \
   python3-itsdangerous python3-jinja2 python3-markupsafe \
   python3-networkmanager python3-pyinotify python3-simplejson python3-werkzeug \
   python3 python3-pip python3-wheel python3-setuptools \
-  samba screen sysstat tailscale temurin-21-jre usbutils util-linux \
-  unzip vfu vim wget whiptail xz-utils zip zlib1g
+  samba screen sysstat tailscale telnet temurin-21-jre usbutils util-linux \
+  unzip vfu vfu-yascreen vim vim-runtime wget whiptail xz-utils zip zlib1g
 
 source /opt/openhabian/functions/nodejs-apps.bash
 nodejs_setup

functions/java-jre.bash

@@ -47,7 +47,7 @@ adoptium_fetch_apt() {
   if [[ $1 == "21" ]] && [[ $(getconf LONG_BIT) == 32 ]]; then
     if ! cond_redirect wget -nv -O "${cachedir}/${cachefile}" "${URL}/${pkgfile}"; then echo "FAILED (download JVM pkg)"; rm -f "${cachedir}/${cachefile}"; return 1; fi
   else
-    if ! cond_redirect dpkg --configure -a --confnew; then echo "FAILED (dpkg)"; return 1; fi
+    if ! cond_redirect dpkg --configure -a; then echo "FAILED (dpkg)"; return 1; fi
     if cond_redirect apt-get install --download-only --yes "temurin-${1}-jre"; then echo "OK"; else echo "FAILED"; return 1; fi
   fi
 }