Merge pull request #915 from Telecominfraproject/release-4.1

Release 4.1

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 = <0>;
+			airoha,surge = <1>;
 			airoha,polarity = <2>;
 		};
 

feeds/tip/cloud_discovery/files/usr/bin/cloud_discovery

@@ -49,12 +49,10 @@ function detect_certificate_type() {
 	let issuer = pipe.read("all");
 	pipe.close();
 
-	if (match(issuer, /OpenLAN Demo Birth CA/)) {
+	if (!match(issuer, /Telecom Infra Project Issuing 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');
 	}

feeds/tip/cloud_discovery/files/usr/bin/est_client

@@ -16,11 +16,9 @@ function set_est_server() {
 	let issuer = pipe.read("all");
 	pipe.close();
 
-	if (match(issuer, /OpenLAN Demo Birth CA/)) {
+	if (!match(issuer, /Telecom Infra Project Issuing 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');
 	}
@@ -167,7 +165,7 @@ function fwtool() {
 	let issuer = pipe.read("all");
 	pipe.close();
 
-	if (!(match(issuer, /OpenLAN/) && match(issuer, /Birth/)))
+	if (!(match(issuer, /OpenLAN/) && match(issuer, /Birth CA/)))
 		return 0;
 
 	ulog(LOG_INFO, 'The issuer is insta\n');

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 opt138 = getenv("opt138");
+let opt224 = getenv("opt138");
 let opt224 = getenv("opt224");
 
 if (cmd != 'bound' && cmd != 'renew')

feeds/ucentral/ucentral-state/files/ucentral-state

@@ -20,7 +20,6 @@ let config;
 let offline_timer;
 let current_state;
 let online = false;
-let leds_off = false;
 
 function self_healing() {
 	let heal_wifi = false;
@@ -149,13 +148,6 @@ 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');
 
@@ -199,7 +191,7 @@ function led_find(alias) {
 function factory_reset_timeout() {
 	let led = led_find('led-running');
 	if (led)
-		led_write(led, 'trigger', leds-off ? 'none' : 'default-on');
+		led_write(led, 'trigger', 'default-on');
 }
 
 let blink_timer;
@@ -218,7 +210,7 @@ let state_handler = {
 	offline: function() {
 		online = false;
 		let led = led_find('led-running');
-		if (!leds_off && led)
+		if (led)
 			led_write(led, 'trigger', 'heartbeat');
 		if (config.ui.offline_trigger) {
 			if (offline_timer)
@@ -231,7 +223,7 @@ let state_handler = {
 	online: function() {
 		online = true;
 		let led = led_find('led-running');
-		if (!leds_off && led)
+		if (led)
 			led_write(led, 'trigger', 'default-on');
 		online_handler();
 		return 0;