1sttrixie (#2071)

* remove outdated Platform line from FireMotD output
* remove non-ex software-properties-common pkg
* sorted offline pkgs by name

Signed-off-by: Markus Storm <[email protected]>

Author: mstormi

build-image/offline-install-modifications.bash

@@ -33,22 +33,26 @@ adoptium_fetch_apt
 
 apt-get --quiet update
 apt-get --quiet upgrade --yes --force-confnew
-apt-get --quiet install --download-only --yes libc6 libstdc++6 zlib1g make \
-  openhab openhab-addons samba amanda-common amanda-server amanda-client exim4 \
-  dnsutils mailutils gdisk screen nano mc vfu bash-completion coreutils \
-  curl multitail git util-linux man-db whiptail usbutils dirmngr \
-  acl apt-transport-https arping avahi-daemon bc bzip2 comitup fontconfig jq moreutils \
-  dns-root-data dnsmasq-base htop iotop javascript-common libcairo2 libgudev-1.0-0 \
-  libjs-jquery libmbim-glib4 libmbim-proxy libmm-glib0 libndp0 libnm0 \
-  libpixman-1-0 libqmi-glib5 libqmi-proxy libteamdctl0 libxcb-render0 \
-  libxcb-shm0 libxrender1 modemmanager network-manager python3-blinker \
-  python3-cairo python3-click python3-colorama python3-flask \
+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 \
+  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 \
-  sysstat tailscale temurin-21-jre unzip vim wget xz-utils zip
+  samba screen sysstat tailscale temurin-21-jre usbutils util-linux \
+  unzip vfu vim wget whiptail xz-utils zip zlib1g
+
 source /opt/openhabian/functions/nodejs-apps.bash
 nodejs_setup
+
 apt-get --quiet autoremove --yes
 rm -f /var/lib/apt/lists/lock
 rm -f /var/cache/apt/archives/lock

functions/system.bash

@@ -50,7 +50,7 @@ basic_packages() {
   dpkg --configure -a --force-confnew  # just in case to ensure apt works
 
   if cond_redirect apt-get -o DPkg::Lock::Timeout="$APTTIMEOUT" install --yes acl arping apt-utils bash-completion bzip2 coreutils \
-    curl dirmngr git htop man-db mc multitail nano nmap lsb-release screen software-properties-common \
+    curl dirmngr git htop man-db mc multitail nano nmap lsb-release screen \	# software-properties-common \
     telnet usbutils util-linux vfu vim wget whiptail xz-utils zip; \
   then echo "OK"; else echo "FAILED"; exit 1; fi
 }