[installer] Copy old config files rather than only minigraph (#730)

sonic-net · Jun 21, 2017 · 95906a6 · 95906a6
1 parent dd104e1
commit 95906a6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 59 deletions.
diff --git a/dockers/docker-fpm-quagga/base_image_files/bgp_neighbor b/dockers/docker-fpm-quagga/base_image_files/bgp_neighbor
diff --git a/files/image_config/platform/rc.local b/files/image_config/platform/rc.local
@@ -29,8 +29,11 @@ if [ -f /host/image-$sonic_version/platform/firsttime ]; then
         exit 0
     fi
 
-    # Try to take minigraph saved during installation
-    if [ -f /host/minigraph.xml ]; then
+    # Try to take old configuration saved during installation
+    if [ -d /host/old_config ]; then
+        rm -f /host/old_config/sonic_version.yml
+        mv -f /host/old_config/* /etc/sonic/
+    elif [ -f /host/minigraph.xml ]; then
         mv /host/minigraph.xml /etc/sonic/
     else
         cp /usr/share/sonic/device/$platform/minigraph.xml /etc/sonic/

diff --git a/rules/docker-fpm-quagga.mk b/rules/docker-fpm-quagga.mk
@@ -11,4 +11,3 @@ $(DOCKER_FPM_QUAGGA)_RUN_OPT += --net=host --privileged -t
 $(DOCKER_FPM_QUAGGA)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
 
 $(DOCKER_FPM_QUAGGA)_BASE_IMAGE_FILES += vtysh:/usr/bin/vtysh
-$(DOCKER_FPM_QUAGGA)_BASE_IMAGE_FILES += bgp_neighbor:/usr/bin/bgp_neighbor
diff --git a/src/sonic-utilities b/src/sonic-utilities