RDKBACCL-1463: DB and other customized values are overwritten to default without FR after firmware upgrade

Reason for change: Mounting nvram partition in /nvram folder
Test procedure: Sanity and FWUpgrade
Risks: Low

Signed-off-by: Manigandan Gopalakrishnan <Manigandan_Gopalakrishnan@comcast.com>

Author: manigandanj

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/ccsp-common-library.bbappend

@@ -3,6 +3,8 @@ include ccsp_common_bananapi.inc
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:${THISDIR}/files:"
 SRC_URI_append = " \
                    file://gwprovapp.conf \
+                   file://mount-nvram.service \
+                   file://mount-nvram.sh \
                 "
 CFLAGS_aarch64_append = " -Werror=format-truncation=1 "
 
@@ -76,6 +78,10 @@ do_install_append_class-target() {
    fi
    sed -i '/IsErouterRunningStatus/,/fi/ s/^/#/' ${D}/usr/ccsp/ccspPAMCPCheck.sh
    sed -i '/ExecStart=/i ExecStartPre=/usr/bin/start_cron' ${D}/lib/systemd/system/RdkFwUpgradeManager.service
+
+   # Mounting nvram partition
+   install -m 0644 ${WORKDIR}/mount-nvram.service ${D}${systemd_unitdir}/system/
+   install -m 0777 ${WORKDIR}/mount-nvram.sh ${D}${base_libdir}/rdk/
 }
 
 
@@ -93,6 +99,7 @@ SYSTEMD_SERVICE_${PN} += "webpa.service"
 SYSTEMD_SERVICE_${PN}_remove = " utopia.service"
 SYSTEMD_SERVICE_${PN} += " CcspAdvSecuritySsp.service"
 SYSTEMD_SERVICE_${PN} += "CcspXdnsSsp.service"
+SYSTEMD_SERVICE_${PN} += "mount-nvram.service"
 
 FILES_${PN}_remove_onewifi = "${systemd_unitdir}/system/ccspwifiagent.service"
 FILES_${PN}_remove = "${systemd_unitdir}/system/utopia.service" 
@@ -108,4 +115,6 @@ FILES_${PN}_append = " \
    ${systemd_unitdir}/system/parodus.service \
    ${systemd_unitdir}/system/webpa.service \
    ${systemd_unitdir}/system/CcspAdvSecuritySsp.service \
+   ${systemd_unitdir}/system/mount-nvram.service \
+   ${base_libdir}/rdk/mount-nvram.sh \
    "

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/files/gwprovapp.conf

@@ -1,6 +1,7 @@
 [Unit]
-After=network.target
+After=network.target mount-nvram.service
 Wants=network.target
+Requires=mount-nvram.service
 
 [Service]
 ExecStart=/usr/bin/gw_prov_utopia

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/files/mount-nvram.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=Mount nvram partition
+Before=gwprovapp.service
+
+[Service]
+ExecStart=/bin/sh /lib/rdk/mount-nvram.sh
+Restart=on-failure
+RestartSec=2
+
+[Install]
+WantedBy=multi-user.target

meta-rdk-mtk-bpir4/recipes-ccsp/ccsp/files/mount-nvram.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+blkid_output=$(blkid /dev/mmcblk0p9 | grep 'TYPE="ext4"')
+
+echo "blkid_output:$blkid_output" >>/tmp/mount-nvram.log
+if [ -z "$blkid_output" ]; then
+echo "First boot after flashing SD card -- nvram partition is not formatted." >>/tmp/mount-nvram.log
+echo "Formatting nvram partition." >>/tmp/mount-nvram.log
+mkfs.ext4 -F /dev/mmcblk0p9
+else
+echo "Nvram partition already formatted." >>/tmp/mount-nvram.log
+fi
+
+mkdir -p /nvram
+mount /dev/mmcblk0p9 /nvram
+if [ "$?" != "0" ]; then
+echo "Mounting nvram partition failed." >>/tmp/mount-nvram.log
+exit 1
+fi
+mkdir -p /nvram/secure
+
+exit 0

meta-rdk-mtk-bpir4/recipes-ccsp/util/utopia.bbappend

@@ -96,6 +96,8 @@ sed -i 's/^\(\$mgmt_wan_httpaccess=\)1/\10/' ${D}${sysconfdir}/utopia/system_def
 sed -i 's/^\(\$mgmt_wan_httpsport=\)443/\18181/' ${D}${sysconfdir}/utopia/system_defaults
 sed -i '/mgmt_wan_httpaccess/i \$mgmt_wan_httpaccess_ert=1' ${D}${sysconfdir}/utopia/system_defaults
 
+#Mounting nvram
+sed -i '/Before=CcspPandMSsp.service/a Requires=mount-nvram.service' ${D}/lib/systemd/system/ApplySystemDefaults.service
 }
 
 FILES_${PN} += " \

meta-rdk-mtk-bpir4/recipes-devtools/init-filogic/init-filogic.bbappend

@@ -6,6 +6,7 @@ do_install_append(){
        sed -i '/brctl addif brlan0 lan0/d' ${D}${sbindir}/init-bridge.sh
    fi
 sed -i '/model/a \
+while [ `mount | grep nvram | wc -l` -eq 0 ]; do usleep 500000 ; done; \
 if [ ! -d /nvram/secure ]; then \
     mkdir -p /nvram/secure \
 fi \
@@ -22,6 +23,10 @@ if [ $? -eq 0 ];then \
    BRLAN_MAC=`cat /nvram/mac_addresses.txt | grep -a brlan0 | cut -d " " -f 2` \
    ifconfig brlan0 hw ether $BRLAN_MAC \
 fi' ${D}${sbindir}/init-bridge.sh
+
+#Mounting nvram
+   sed -i '/Before=CcspPandMSsp.service/a Requires=mount-nvram.service' ${D}/lib/systemd/system/init-Lanbridge.service
+   sed -i 's/utopia.service/mount-nvram.service &/' ${D}/lib/systemd/system/init-Lanbridge.service
 }
 
 #ESDK support - Avoid conflict file is installed by both systemd and init-filogic in kirkstone

meta-rdk-mtk-bpir4/recipes-kernel/linux/files/rdkb_cfg/sdmmc.cfg

@@ -1,4 +1,4 @@
-CONFIG_EXT4_DEBUG=y
+CONFIG_F2FS_FS=n
 CONFIG_EXT4_ENCRYPTION=y
 CONFIG_EXT4_FS=y 
 CONFIG_EXT4_FS_POSIX_ACL=y