Merge pull request #925 from Telecominfraproject/release-4.1

Release 4.1
Merge remote-tracking branch 'origin/main' into release-4.1
2025-10-29 09:32:34 +00:00 · 2025-08-30 12:44:52 -04:00 · 2025-08-30 12:42:04 -04:00 · 2025-08-29 22:52:28 -04:00 · 2025-08-28 21:39:54 -04:00 · 2025-08-20 08:16:30 +02:00
5 changed files with 20 additions and 8 deletions
--- a/feeds/mediatek-sdk/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-edgecore-eap111.dts
+++ b/feeds/mediatek-sdk/mediatek/files-5.4/arch/arm64/boot/dts/mediatek/mt7981-edgecore-eap111.dts
@@ -200,7 +200,7 @@
 			phy-mode = "sgmii";
 			full-duplex;
 			pause;
-			airoha,surge = <1>;
+			airoha,surge = <0>;
 			airoha,polarity = <2>;
 		};

--- a/feeds/tip/cloud_discovery/files/usr/bin/cloud_discovery
+++ b/feeds/tip/cloud_discovery/files/usr/bin/cloud_discovery
@@ -49,10 +49,12 @@ function detect_certificate_type() {
 	let issuer = pipe.read("all");
 	pipe.close();

-	if (!match(issuer, /Telecom Infra Project Issuing CA/)) {
+	if (match(issuer, /OpenLAN Demo Birth CA/)) {
 		ulog(LOG_INFO, 'Certificate type is "Demo" \n');
 		cds_server = 'discovery-qa.open-lan.org';
 		timeouts.expiry_threshold = 3 * 24 * 60 * 60;
+	} else if (match(issuer, /OpenLAN Birth Issuing CA/)) {
+		ulog(LOG_INFO, 'Certificate type is "Production"\n');
 	} else {
 		ulog(LOG_INFO, 'Certificate type is "TIP"\n');
 	}
--- a/feeds/tip/cloud_discovery/files/usr/bin/est_client
+++ b/feeds/tip/cloud_discovery/files/usr/bin/est_client
@@ -16,9 +16,11 @@ function set_est_server() {
 	let issuer = pipe.read("all");
 	pipe.close();

-	if (!match(issuer, /Telecom Infra Project Issuing CA/)) {
+	if (match(issuer, /OpenLAN Demo Birth CA/)) {
 		ulog(LOG_INFO, 'Certificate type is "Demo" \n');
 		est_server = 'qaest.certificates.open-lan.org:8001';
+	} else if (match(issuer, /OpenLAN Birth Issuing CA/)) {
+		ulog(LOG_INFO, 'Certificate type is "Production"\n');
 	} else {
 		ulog(LOG_INFO, 'Certificate type is "TIP"\n');
 	}
@@ -165,7 +167,7 @@ function fwtool() {
 	let issuer = pipe.read("all");
 	pipe.close();

-	if (!(match(issuer, /OpenLAN/) && match(issuer, /Birth CA/)))
+	if (!(match(issuer, /OpenLAN/) && match(issuer, /Birth/)))
 		return 0;

 	ulog(LOG_INFO, 'The issuer is insta\n');
--- a/feeds/tip/cloud_discovery/files/usr/share/ucentral/cloud_discovery.uc
+++ b/feeds/tip/cloud_discovery/files/usr/share/ucentral/cloud_discovery.uc
@@ -5,7 +5,7 @@ import * as fs from 'fs';

 let cmd = ARGV[0];
 let ifname = getenv("interface");
-let opt224 = getenv("opt138");
+let opt138 = getenv("opt138");
 let opt224 = getenv("opt224");

 if (cmd != 'bound' && cmd != 'renew')
--- a/feeds/ucentral/ucentral-state/files/ucentral-state
+++ b/feeds/ucentral/ucentral-state/files/ucentral-state
@@ -20,6 +20,7 @@ let config;
 let offline_timer;
 let current_state;
 let online = false;
+let leds_off = false;

 function self_healing() {
 	let heal_wifi = false;
@@ -148,6 +149,13 @@ function online_handler() {

 function config_load() {
 	ulog(LOG_INFO, 'loading config\n');
+
+	uci.load('system');
+	let led_off_cfg = uci.get("system", "@system[0]", "leds_off");
+	if (led_off_cfg == 1) {
+		leds_off = true;
+	}
+
 	uci.load('state');
 	config = uci.get_all('state');

@@ -191,7 +199,7 @@ function led_find(alias) {
 function factory_reset_timeout() {
 	let led = led_find('led-running');
 	if (led)
-		led_write(led, 'trigger', 'default-on');
+		led_write(led, 'trigger', leds-off ? 'none' : 'default-on');
 }

 let blink_timer;
@@ -210,7 +218,7 @@ let state_handler = {
 	offline: function() {
 		online = false;
 		let led = led_find('led-running');
-		if (led)
+		if (!leds_off && led)
 			led_write(led, 'trigger', 'heartbeat');
 		if (config.ui.offline_trigger) {
 			if (offline_timer)
@@ -223,7 +231,7 @@ let state_handler = {
 	online: function() {
 		online = true;
 		let led = led_find('led-running');
-		if (led)
+		if (!leds_off && led)
 			led_write(led, 'trigger', 'default-on');
 		online_handler();
 		return 0;
Author	SHA1	Message	Date
jaspreetsachdev	7dd139cf3b	Merge pull request #925 from Telecominfraproject/release-4.1 Release 4.1	2025-08-30 12:44:52 -04:00
Jaspreet Sachdev	544b687f46	Merge remote-tracking branch 'origin/main' into release-4.1	2025-08-30 12:42:04 -04:00
Arif Alam	c27b015a63	est_client: fix certificate issuer matching Signed-off-by: Arif Alam <arif.alam@netexperience.com>	2025-08-29 22:52:28 -04:00
Arif Alam	02c2e6945b	est_client: cloud_discovery: fixup demo environment Signed-off-by: Arif Alam <arif.alam@netexperience.com>	2025-08-28 21:39:54 -04:00
Sebastian Huang	e7cd5038ac	mediatek-sdk: Disable surge protection mode for AN8801SB PHY driver Signed-off-by: Sebastian Huang <sebastian_huang@accton.com>	2025-08-20 08:16:30 +02:00
Paul White	34e4a01e25	ucentral-state: Respect LED config before enabling Ensure that LEDs are configured to be ON before attempting to change their state. Previously, if the LED was configured to be OFF, it would still enter a double-blink state when the cloud connection was lost, and then switch to solid ON upon reconnection—ignoring the configured OFF state. This update changes that behavior: - If LEDs are configured OFF, they will remain OFF even during cloud disconnection (no double-blink). - After temporary state changes (e.g., during factory reset), the LED will return to its configured state (either OFF or ON). Signed-off-by: Paul White <paul@shasta.cloud>	2025-08-20 08:16:08 +02:00
Tanya Singh	60e9fb2645	cloud_discover: typo fix in DHCP script option 138 Signed-off-by: Tanya Singh <tanya_singh@accton.com>	2025-08-19 07:33:01 +02:00
jaspreetsachdev	462ff4f813	Merge pull request #915 from Telecominfraproject/release-4.1 Release 4.1	2025-08-18 12:28:42 -04:00
Jaspreet Sachdev	71b738f8ee	Merge remote-tracking branch 'origin/main' into release-4.1	2025-08-18 12:26:55 -04:00
jaspreetsachdev	4ad04c7948	Merge pull request #914 from Telecominfraproject/release-4.1 Release 4.1 merge	2025-08-14 09:54:57 -04:00