From 8e36068237380954e749a629e145821f8015e661 Mon Sep 17 00:00:00 2001
From: Joe LeVeque <jleveque@users.noreply.github.com>
Date: Thu, 5 Mar 2020 15:35:35 -0800
Subject: [PATCH] [sonic-cfggen] Loading the configuration from init_cfg.json
 and then from config_db.json (#4148)

---
 files/build_templates/docker_image_ctl.j2 | 8 ++++++--
 files/scripts/configdb-load.sh            | 8 ++++++--
 platform/p4/docker-sonic-p4/start.sh      | 2 +-
 platform/vs/docker-sonic-vs/start.sh      | 2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2
index 9357ae58d4..a15546a1e5 100644
--- a/files/build_templates/docker_image_ctl.j2
+++ b/files/build_templates/docker_image_ctl.j2
@@ -106,9 +106,13 @@ function postStartAction()
     if [[ ("$BOOT_TYPE" == "warm" || "$BOOT_TYPE" == "fastfast") && -f $WARM_DIR/dump.rdb ]]; then
         rm -f $WARM_DIR/dump.rdb
     else
-        # If there is a config db dump file, load it
+        # If there is a config_db.json dump file, load it.
         if [ -r /etc/sonic/config_db.json ]; then
-            sonic-cfggen -j /etc/sonic/config_db.json --write-to-db
+            if [ -r /etc/sonic/init_cfg.json ]; then
+                sonic-cfggen -j /etc/sonic/init_cfg.json -j /etc/sonic/config_db.json --write-to-db
+            else
+                sonic-cfggen -j /etc/sonic/config_db.json --write-to-db
+            fi
         fi
 
         if [[ "$BOOT_TYPE" == "fast" ]]; then
diff --git a/files/scripts/configdb-load.sh b/files/scripts/configdb-load.sh
index e7080eb40f..b1bf761371 100755
--- a/files/scripts/configdb-load.sh
+++ b/files/scripts/configdb-load.sh
@@ -5,9 +5,13 @@ until [[ $(redis-cli ping | grep -c PONG) -gt 0 ]]; do
   sleep 1;
 done
 
-# If there is a config db dump file, load it
+# If there is a config_db.json dump file, load it.
 if [ -r /etc/sonic/config_db.json ]; then
-    sonic-cfggen -j /etc/sonic/config_db.json --write-to-db
+    if [ -r /etc/sonic/init_cfg.json ]; then
+        sonic-cfggen -j /etc/sonic/init_cfg.json -j /etc/sonic/config_db.json --write-to-db
+    else
+        sonic-cfggen -j /etc/sonic/config_db.json --write-to-db
+    fi
 fi
 
 sonic-db-cli CONFIG_DB SET "CONFIG_DB_INITIALIZED" "1"
diff --git a/platform/p4/docker-sonic-p4/start.sh b/platform/p4/docker-sonic-p4/start.sh
index c9cf4528be..e3251bb2f4 100755
--- a/platform/p4/docker-sonic-p4/start.sh
+++ b/platform/p4/docker-sonic-p4/start.sh
@@ -11,7 +11,7 @@ SYSTEM_MAC_ADDRESS=$(ip link show eth0 | grep ether | awk '{print $2}')
 sonic-cfggen -a '{"DEVICE_METADATA":{"localhost": {"mac": "'$SYSTEM_MAC_ADDRESS'"}}}' --print-data > /etc/sonic/init_cfg.json
 
 if [ -f /etc/sonic/config_db.json ]; then
-    sonic-cfggen -j /etc/sonic/config_db.json -j /etc/sonic/init_cfg.json --print-data > /tmp/config_db.json
+    sonic-cfggen -j /etc/sonic/init_cfg.json -j /etc/sonic/config_db.json --print-data > /tmp/config_db.json
     mv /tmp/config_db.json /etc/sonic/config_db.json
 else
     sonic-cfggen -j /etc/sonic/init_cfg.json --print-data > /etc/sonic/config_db.json
diff --git a/platform/vs/docker-sonic-vs/start.sh b/platform/vs/docker-sonic-vs/start.sh
index dd9fee4deb..f8fcf974b6 100755
--- a/platform/vs/docker-sonic-vs/start.sh
+++ b/platform/vs/docker-sonic-vs/start.sh
@@ -13,7 +13,7 @@ SYSTEM_MAC_ADDRESS=$(ip link show eth0 | grep ether | awk '{print $2}')
 sonic-cfggen -a '{"DEVICE_METADATA":{"localhost": {"mac": "'$SYSTEM_MAC_ADDRESS'"}}}' --print-data > /etc/sonic/init_cfg.json
 
 if [ -f /etc/sonic/config_db.json ]; then
-    sonic-cfggen -j /etc/sonic/config_db.json -j /etc/sonic/init_cfg.json --print-data > /tmp/config_db.json
+    sonic-cfggen -j /etc/sonic/init_cfg.json -j /etc/sonic/config_db.json --print-data > /tmp/config_db.json
     mv /tmp/config_db.json /etc/sonic/config_db.json
 else
     # generate and merge buffers configuration into config file