diff options
author | Ed Tanous <ed.tanous@intel.com> | 2019-07-31 20:43:37 +0300 |
---|---|---|
committer | Ed Tanous <ed.tanous@intel.com> | 2019-08-01 18:19:38 +0300 |
commit | d0f63ef62c76c932a2003eaa42c0b250065ae06f (patch) | |
tree | 4c0e3cb32dc80f80460bdbf82ff6d401d4ff194f /meta-openbmc-mods/meta-common/recipes-phosphor/settings/phosphor-settings-manager/0001-settings-initialize-data-file-with-default-setting.patch | |
parent | b4f66bacb1b8e661d794fa7a189e2f66f5092e2e (diff) | |
download | openbmc-d0f63ef62c76c932a2003eaa42c0b250065ae06f.tar.xz |
Update to internal 7-31-19
Signed-off-by: Ed Tanous <ed.tanous@intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-phosphor/settings/phosphor-settings-manager/0001-settings-initialize-data-file-with-default-setting.patch')
-rw-r--r-- | meta-openbmc-mods/meta-common/recipes-phosphor/settings/phosphor-settings-manager/0001-settings-initialize-data-file-with-default-setting.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/settings/phosphor-settings-manager/0001-settings-initialize-data-file-with-default-setting.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/settings/phosphor-settings-manager/0001-settings-initialize-data-file-with-default-setting.patch deleted file mode 100644 index fcf2415d6..000000000 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/settings/phosphor-settings-manager/0001-settings-initialize-data-file-with-default-setting.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 9e99aa4f72f4420e03ec2e4a29816eae43c5e748 Mon Sep 17 00:00:00 2001 -From: "Jia, Chunhui" <chunhui.jia@intel.com> -Date: Tue, 29 May 2018 16:16:06 +0800 -Subject: [PATCH] [settings] initialize data file with default setting - -Current code trys to load settings from file at startup. When file -does not exist, it will just use default setting. However, it will -still load default on next reboot because no one create files. - -This change creates file as well when daemon loads default so next -time daemon could load/save from file. - -Signed-off-by: Jia, Chunhui <chunhui.jia@intel.com> ---- - settings_manager.mako.hpp | 3 +++ - 1 file changed, 3 insertions(+) - mode change 100644 => 100755 settings_manager.mako.hpp - -diff --git a/settings_manager.mako.hpp b/settings_manager.mako.hpp -old mode 100644 -new mode 100755 -index 09a5a1f..cd592a0 ---- a/settings_manager.mako.hpp -+++ b/settings_manager.mako.hpp -@@ -323,6 +323,9 @@ class Manager - else - { - initSetting${index}(); -+ std::ofstream ostr(path.c_str(), std::ios::out); -+ cereal::JSONOutputArchive oarchive(ostr); -+ oarchive(*std::get<${index}>(settings)); //create file with default - } - } - catch (cereal::Exception& e) --- -2.16.2 - |