From a65cf4d9bb9baa406e074d3f5f6aba9e6d8e538f Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor@armbian.com>
Date: Thu, 20 Jun 2024 13:11:18 +0200
Subject: [PATCH] Remove ifupdown leftovers in the code

---
 config/cli/common/main/packages.additional          |  1 -
 config/cli/noble/main/packages.additional           |  1 -
 config/cli/sid/main/packages.additional             |  1 -
 config/cli/trixie/main/packages.additional          |  1 -
 extensions/network/net-ifupdown2.sh                 | 13 -------------
 .../common/usr/lib/armbian/armbian-hardware-monitor |  2 +-
 6 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 extensions/network/net-ifupdown2.sh

diff --git a/config/cli/common/main/packages.additional b/config/cli/common/main/packages.additional
index 860620bff..db545ca7c 100644
--- a/config/cli/common/main/packages.additional
+++ b/config/cli/common/main/packages.additional
@@ -25,7 +25,6 @@ hdparm
 htop
 html2text
 i2c-tools
-ifenslave
 iotop
 iperf3
 iptables
diff --git a/config/cli/noble/main/packages.additional b/config/cli/noble/main/packages.additional
index 92589c32d..a2a78f4ac 100644
--- a/config/cli/noble/main/packages.additional
+++ b/config/cli/noble/main/packages.additional
@@ -23,7 +23,6 @@ hdparm
 htop
 html2text
 i2c-tools
-ifenslave
 iotop
 iperf3
 iptables
diff --git a/config/cli/sid/main/packages.additional b/config/cli/sid/main/packages.additional
index 92589c32d..a2a78f4ac 100644
--- a/config/cli/sid/main/packages.additional
+++ b/config/cli/sid/main/packages.additional
@@ -23,7 +23,6 @@ hdparm
 htop
 html2text
 i2c-tools
-ifenslave
 iotop
 iperf3
 iptables
diff --git a/config/cli/trixie/main/packages.additional b/config/cli/trixie/main/packages.additional
index 92589c32d..a2a78f4ac 100644
--- a/config/cli/trixie/main/packages.additional
+++ b/config/cli/trixie/main/packages.additional
@@ -23,7 +23,6 @@ hdparm
 htop
 html2text
 i2c-tools
-ifenslave
 iotop
 iperf3
 iptables
diff --git a/extensions/network/net-ifupdown2.sh b/extensions/network/net-ifupdown2.sh
deleted file mode 100644
index b05c507a4..000000000
--- a/extensions/network/net-ifupdown2.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Extension for ifupdown2
-#
-function add_host_dependencies__install_ifupdown2() {
-        display_alert "Adding Netplan to systemd-networkd" "systemd-timesyncd" "info"
-        add_packages_to_rootfs ifupdown2 iproute2 bridge-utils vlan
-}
-
-function pre_install_kernel_debs__configure_systemd_networkd()
-{
-	display_alert "${EXTENSION}: enabling ifupdown2" "" "info"
-
-}
diff --git a/packages/bsp/common/usr/lib/armbian/armbian-hardware-monitor b/packages/bsp/common/usr/lib/armbian/armbian-hardware-monitor
index 6a35ba7e7..9f170b280 100755
--- a/packages/bsp/common/usr/lib/armbian/armbian-hardware-monitor
+++ b/packages/bsp/common/usr/lib/armbian/armbian-hardware-monitor
@@ -84,7 +84,7 @@ log_hardware_info() {
 		echo -e "\n### ip addr:\n" >>${Log}
 		/sbin/ip r s >>${Log} ; /sbin/ip a >>${Log}
 		echo " " >>${Log}
-	else
+	elif [ -x /sbin/ifconfig ]; then
 		echo -e "\n### ifconfig:\n" >>${Log}
 		ifconfig >>${Log}
 	fi