state-manager: remove no-warm-reboot default
Most systems are fine with supporting a warm reboot so don't make it a
default.
Change-Id: Ifb906f0b0d81b97265b6b6a79104408161bded7e
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/meta-ampere/meta-jade/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/state/phosphor-state-manager_%.bbappend
deleted file mode 100644
index 9947016..0000000
--- a/meta-ampere/meta-jade/recipes-phosphor/state/phosphor-state-manager_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-PACKAGECONFIG:remove = "no-warm-reboot"
diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-facebook/meta-bletchley/recipes-phosphor/state/phosphor-state-manager_%.bbappend
index dd2711e..1faa301 100644
--- a/meta-facebook/meta-bletchley/recipes-phosphor/state/phosphor-state-manager_%.bbappend
+++ b/meta-facebook/meta-bletchley/recipes-phosphor/state/phosphor-state-manager_%.bbappend
@@ -31,6 +31,7 @@
BLETCHLEY_SYS_ST_INIT_CONF_FMT = "bletchley-system-state-init.conf:phosphor-discover-system-state@{0}.service.d/bletchley-system-state-init.conf"
SYSTEMD_OVERRIDE:${PN}-discover += "${@compose_list_zip(d, 'BLETCHLEY_SYS_ST_INIT_CONF_FMT', 'OBMC_HOST_INSTANCES')}"
+PACKAGECONFIG:append = "no-warm-reboot"
PACKAGECONFIG:remove = "only-run-apr-on-power-loss"
#======================
diff --git a/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager_%.bbappend
index e75785c..9e115bb 100644
--- a/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager_%.bbappend
+++ b/meta-facebook/meta-harma/recipes-phosphor/state/phosphor-state-manager_%.bbappend
@@ -1,7 +1,6 @@
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-PACKAGECONFIG:remove = "no-warm-reboot only-run-apr-on-power-loss"
-
+PACKAGECONFIG:remove = "only-run-apr-on-power-loss"
CHASSIS_DEFAULT_TARGETS:remove = " \
obmc-chassis-powerreset@{}.target.requires/phosphor-reset-chassis-on@{}.service \
diff --git a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager_%.bbappend
index fe10c35..b0ba7fd 100644
--- a/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager_%.bbappend
+++ b/meta-facebook/meta-yosemite4/recipes-phosphor/state/phosphor-state-manager_%.bbappend
@@ -4,6 +4,7 @@
-Dwarm-reboot=enabled \
"
+PACKAGECONFIG:append = "no-warm-reboot"
PACKAGECONFIG:remove = "only-run-apr-on-power-loss"
HOST_DEFAULT_TARGETS:remove = " \
diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb
index 0b372d9..89eec31 100644
--- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager_git.bb
@@ -35,8 +35,8 @@
${PN}-systemd-target-monitor \
"
-PACKAGECONFIG ??= "no-warm-reboot \
- only-run-apr-on-power-loss \
+# Set the common defaults
+PACKAGECONFIG ??= "only-run-apr-on-power-loss \
only-allow-boot-when-bmc-ready"
# Disable warm reboots of host