Fixing default route search and code comment typo

armbian · Oct 9, 2024 · 67f2e77 · 67f2e77
1 parent 388ce4e
commit 67f2e77
Show file tree

Hide file tree

Showing 5 changed files with 254 additions and 80 deletions.
diff --git a/lib/armbian-configng/config.ng.functions.sh b/lib/armbian-configng/config.ng.functions.sh
@@ -203,10 +203,10 @@ function set_runtime_variables() {
 	fi
 
 	# Determine which network renderer is in use for NetPlan
-	if systemctl is-active systemd-networkd 1> /dev/null; then
-		renderer=networkd
+	if systemctl is-active NetworkManager 1> /dev/null; then
+		NETWORK_RENDERER=NetworkManager
 	else
-		renderer=NetworkManager
+		NETWORK_RENDERER=networkd
 	fi
 
 	DIALOG_CANCEL=1
@@ -775,7 +775,7 @@ menu_options+=(
 function process_input() {
 	local input="$1"
 	if [ "$input" = "No" ]; then
-		exit 1
+		return 1
 	fi
 }
 

diff --git a/lib/armbian-configng/config.ng.jobs.json b/lib/armbian-configng/config.ng.jobs.json
@@ -409,7 +409,7 @@
                     "sub": [
                         {
                             "id": "N02",
-                            "description": "Add interface",
+                            "description": "Add / change interface",
                             "command": [
                                 "network_config armbian"
                             ],
@@ -419,17 +419,17 @@
                         },
                         {
                             "id": "N03",
-                            "description": "Revert to defaults",
+                            "description": "Revert to Armbian defaults",
                             "command": [
                                 "default_network_config"
                             ],
                             "status": "Preview",
                             "author": "Igor Pecovnik",
-                            "condition": "[[ -f /etc/netplan/armbian.yaml ]] && ! cat /etc/netplan/armbian.yaml | diff -q 1>/dev/null <(netplan get all) - || [[ ! -f /etc/netplan/10-dhcp-all-interfaces.yaml ]] && ! cat /etc/netplan/10-dhcp-all-interfaces.yaml 2>/dev/null | diff -q 1>/dev/null <(netplan get all) -"
+                            "condition": ""
                         },
                         {
                             "id": "N04",
-                            "description": "Show draft configuration",
+                            "description": "Show configuration",
                             "command": [
                                 "show_message <<< \"$(netplan get all)\""
                             ],
@@ -439,19 +439,6 @@
                             "author": "Igor Pecovnik",
                             "condition": "[[ -f /etc/netplan/armbian.yaml ]]"
                         },
-                        {
-                            "id": "N05",
-                            "description": "Apply changes",
-                            "prompt": "This will apply new network configuration\n\nwould you like to continue?",
-                            "command": [
-                                "netplan apply"
-                            ],
-                            "status": "Preview",
-                            "doc_link": "",
-                            "src_reference": "",
-                            "author": "Igor Pecovnik",
-                            "condition": "[[ -f /etc/netplan/armbian.yaml ]] && ! cat /etc/netplan/armbian.yaml | diff -q 1>/dev/null <(netplan get all) - || [[ -f /etc/netplan/10-dhcp-all-interfaces.yaml ]]"
-                        },
                         {
                             "id": "N06",
                             "description": "Show active status",