From bf567ddf77e2c41eae169733034affd7fb83ef8e Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Fri, 11 Jan 2019 13:45:19 +0200
Subject: [PATCH] Rename /etc/init.d/conf to /etc/init.d/os_conf

---
 board/common/overlay/etc/init.d/S01mountall       | 2 +-
 board/common/overlay/etc/init.d/base              | 2 +-
 board/common/overlay/etc/init.d/{conf => os_conf} | 0
 board/common/overlay/sbin/fwupdate                | 4 ++--
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename board/common/overlay/etc/init.d/{conf => os_conf} (100%)

diff --git a/board/common/overlay/etc/init.d/S01mountall b/board/common/overlay/etc/init.d/S01mountall
index 71065f714d..ac987534aa 100755
--- a/board/common/overlay/etc/init.d/S01mountall
+++ b/board/common/overlay/etc/init.d/S01mountall
@@ -31,7 +31,7 @@ case "$1" in
         mount_fs
 
         # we need to source conf again, now that /data is available
-        test -n "$os_debug" || source /etc/init.d/conf
+        test -n "$os_debug" || source /etc/init.d/os_conf
         test "$os_debug" == "true" && remount_rw
         mk_tty_login
         ;;
diff --git a/board/common/overlay/etc/init.d/base b/board/common/overlay/etc/init.d/base
index 7a102d51ff..b6917581f3 100755
--- a/board/common/overlay/etc/init.d/base
+++ b/board/common/overlay/etc/init.d/base
@@ -4,7 +4,7 @@ source /etc/version
 board_sn=$(/etc/init.d/boardsn)
 board_name=$(cat /etc/board)
 
-test -n "$os_debug" || source /etc/init.d/conf
+test -n "$os_debug" || source /etc/init.d/os_conf
 
 source /etc/init.d/panic
 
diff --git a/board/common/overlay/etc/init.d/conf b/board/common/overlay/etc/init.d/os_conf
similarity index 100%
rename from board/common/overlay/etc/init.d/conf
rename to board/common/overlay/etc/init.d/os_conf
diff --git a/board/common/overlay/sbin/fwupdate b/board/common/overlay/sbin/fwupdate
index fd7bee5db1..3dafd3b1db 100755
--- a/board/common/overlay/sbin/fwupdate
+++ b/board/common/overlay/sbin/fwupdate
@@ -77,7 +77,7 @@ fi
 #### versions ####
 
 function show_versions() {
-    source /etc/init.d/conf  # we need this for the os_ vars
+    source /etc/init.d/os_conf  # we need this for the os_ vars
     
     board=$(cat $SYS_BOARD_FILE)
     show_json=$1
@@ -144,7 +144,7 @@ function do_download() {
         fi
     fi
 
-    source /etc/init.d/conf  # we need this for the os_ vars
+    source /etc/init.d/os_conf  # we need this for the os_ vars
     
     board=$(cat $SYS_BOARD_FILE)
     url=$1