From 95997e7983decebf25ac4eae45dd406ef2eb583b Mon Sep 17 00:00:00 2001
From: Jeffrey Townsend <jeffrey.townsend@bigswitch.com>
Date: Fri, 20 May 2016 00:08:16 +0000
Subject: [PATCH] Use the system boot-config from /mnt/onl/boot/boot-config if
 present. If not, use system default /etc/onl/boot-config-default if present.

---
 .../base/all/initrds/loader-initrd-files/src/bin/sysinit  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/base/all/initrds/loader-initrd-files/src/bin/sysinit b/packages/base/all/initrds/loader-initrd-files/src/bin/sysinit
index 07b1f2e3..5a42b204 100755
--- a/packages/base/all/initrds/loader-initrd-files/src/bin/sysinit
+++ b/packages/base/all/initrds/loader-initrd-files/src/bin/sysinit
@@ -76,7 +76,13 @@ if [ ! -f /etc/onl/abort ]; then
         cat /etc/issue
     fi
 
-    [ ! -f /mnt/onl/boot/boot-config ] || cat /mnt/onl/boot/boot-config >>/etc/onl/boot-config
+    if [ -f /mnt/onl/boot/boot-config ]; then
+        # Use local boot-config.
+        cp /mnt/onl/boot/boot-config /etc/onl/boot-config
+    elif [ -f /etc/onl/boot-config-default ]; then
+        # Use default boot-config.
+        cp /etc/onl/boot-config-default /etc/onl/boot-config
+    fi
 
     #
     # Initialize the /mnt/flash/boot area.