From 6980c1e2e5838689ef1999637263c06cec097cfd Mon Sep 17 00:00:00 2001
From: Erik Karlsson <erik.karlsson@iopsys.eu>
Date: Wed, 17 Sep 2025 14:13:15 +0200
Subject: [PATCH] ponmngr: use iopsys-environment for reading production data

U-Boot environment is kept as a fallback for legacy reasons.
---
 .../common/etc/uci-defaults/60-xpon-generate    | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)
 mode change 100755 => 100644 ponmngr/files/common/etc/uci-defaults/60-xpon-generate

diff --git a/ponmngr/files/common/etc/uci-defaults/60-xpon-generate b/ponmngr/files/common/etc/uci-defaults/60-xpon-generate
old mode 100755
new mode 100644
index 78cc6ef96..06c2b253c
--- a/ponmngr/files/common/etc/uci-defaults/60-xpon-generate
+++ b/ponmngr/files/common/etc/uci-defaults/60-xpon-generate
@@ -1,10 +1,13 @@
 #!/bin/sh
 
 . /lib/functions/system.sh
+. /lib/functions/iopsys-environment.sh
 
 configure_serial_number() {
 	# check if serial number is present in the production data
-	local production_sn="$(fw_printenv -n gponsn)"
+	local production_sn="$(get_xpon_serial 2>/dev/null)"
+	[ ${#production_sn} -eq 12 ] || production_sn="$(fw_printenv -n gponsn)"
+
 	if [ ${#production_sn} -eq 12 ]; then
 		uci set xpon.ani.serial_number="${production_sn}"
 	else
@@ -21,8 +24,10 @@ configure_ploam_password() {
 	local passwd="$(uci -q get xpon.ani.ploam_password)"
 
 	if [ -z "${passwd}" ]; then
-		local production_passwd="$(fw_printenv -n gponpswd)"
-		if [ -n ${#production_passwd} ]; then
+		local production_passwd="$(get_xpon_password 2>/dev/null)"
+		[ -n "${production_passwd}" ] || production_passwd="$(fw_printenv -n gponpswd)"
+
+		if [ -n "${production_passwd}" ]; then
 			uci set xpon.ani.ploam_password="${production_passwd}"
 			uci set xpon.ani.ploam_hexadecimalpassword=0
 		fi
@@ -37,10 +42,12 @@ configure_loid_authentication() {
 	local loidpwd="$(uci -q get xpon.ani.loid_password)"
 
 	if [ -z "${loid}" ]; then
-		production_loid="$(fw_printenv -n gponloid)"
+		production_loid="$(get_xpon_loid 2>/dev/null)"
+		[ -n "${production_loid}" ] || production_loid="$(fw_printenv -n gponloid)"
 	fi
 	if [ -z "${loidpwd}" ]; then
-		production_loidpwd="$(fw_printenv -n gponloid_password)"
+		production_loidpwd="$(get_xpon_loid_password 2>/dev/null)"
+		[ -n "${production_loidpwd}" ] || production_loidpwd="$(fw_printenv -n gponloid_password)"
 	fi
 
 	if [ -n "${production_loid}" ]; then