commit a692bcccca3ade75f087cb5831a959e4839f6895
author Deepak Kodihalli <dkodihal@in.ibm.com> Sun Aug 27 03:28:25 2017 -0500
committer Patrick Williams <patrick@stwcx.xyz> Fri Sep 08 18:48:58 2017 +0000
tree 7e1939b9d91928907894db30dd1ee57f6a9ec9e3
parent 2a93f743ec3b509d7d5cabe0b75a6ae6c1a4c24e

boot settings: create single object

Now that settings objects can implement multiple interfaces, create a
single control/boot object that implements both the Control/Boot/Mode
and Control/Boot/Source interfaces. This is more natural to apps
interested in this setting, instead of two objects representing the
boot mode and boot source.

Change-Id: I57c1cd65243b2a334352e6c298ed0572bca4c8cd
Signed-off-by: Deepak Kodihalli <dkodihal@in.ibm.com>

common/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml

diff --git a/common/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml b/common/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml
index 00586c9..4acf691 100644
--- a/common/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml
+++ b/common/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml
@@ -10,13 +10,11 @@
           AutoReboot:
              Default: 'true'
 
-/xyz/openbmc_project/control/host0/boot_source:
+/xyz/openbmc_project/control/host0/boot:
     - Interface: xyz.openbmc_project.Control.Boot.Source
       Properties:
           BootSource:
               Default: Source::Sources::Default
-
-/xyz/openbmc_project/control/host0/boot_mode:
     - Interface: xyz.openbmc_project.Control.Boot.Mode
       Properties:
           BootMode: