diff --git a/Kconfig b/Kconfig index 601c3bff98e2e26d63bd5815c4f6b4363c2f071b..a01de548c7ff53ae39e05266064827707789c2f4 100644 --- a/Kconfig +++ b/Kconfig @@ -71,6 +71,14 @@ config DOTCONF_URL MACADDR are substituted before retrieving the file. Example: "tftp://morgana/wrs-config-IPADDR" +if DOTCONF_LOCAL_OVERWRITE +comment "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" +comment "XX Local Overwrite enabled! XX" +comment "XX (config values may be overwritten by values in XX" +comment "XX /update/permanent/dot-config/dot-config-overwrite) XX" +comment "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" +endif + config DOTCONF_LOCAL_OVERWRITE boolean "Overwrite dot-config with values locally stored in /update" default y diff --git a/configs/wrs_release_defconfig b/configs/wrs_release_defconfig index 98de724a1573c78c5f88c667f193cdd36ac3d1d5..08ee6a8f1e8d548526582460efb2fc5acb2a3c58 100644 --- a/configs/wrs_release_defconfig +++ b/configs/wrs_release_defconfig @@ -8,6 +8,26 @@ CONFIG_DOTCONF_INFO="" # CONFIG_DOTCONF_SOURCE_LOCAL is not set # CONFIG_DOTCONF_SOURCE_REMOTE is not set CONFIG_DOTCONF_SOURCE_TRY_DHCP=y + +# +# XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX +# + +# +# XX Local Overwrite enabled! XX +# + +# +# XX (config values may be overwritten by values in XX +# + +# +# XX /update/permanent/dot-config/dot-config-overwrite) XX +# + +# +# XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX +# CONFIG_DOTCONF_LOCAL_OVERWRITE=y CONFIG_LEAPSEC_SOURCE_LOCAL=y # CONFIG_LEAPSEC_SOURCE_REMOTE_FORCE is not set