From 6ce47e9eee0215a14c8f10a770c5c9b39223fd2b Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 17 Dec 2020 11:44:01 -0600 Subject: remove warm reboot from diagnostic target Initially the diagnostic target was only tied to one type of system event. This one system event required a warm reboot so it made sense to just put that directly in this recipe. There are now new use cases for the diagnostic target that do not want or need a warm reboot. Remove the warm reboot from the diagnostic target and let other recipes add it if needed for their use cases. Tested: - Verified with all commits in this Topic that the witherspoon system has the same service layout as before and the rainier system has the new layout (crash used for mpipl) (From meta-phosphor rev: 2406ed7d08b4d4c9f2ea7960094aea9aed79f4ac) Signed-off-by: Andrew Geissler Change-Id: Iea5b791057c74a2be880d842436284fa23bd15bc Signed-off-by: Andrew Geissler --- .../state/phosphor-state-manager-systemd-links.inc | 8 -------- 1 file changed, 8 deletions(-) diff --git a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc index 10e255d58..2c01dea63 100644 --- a/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc +++ b/meta-phosphor/recipes-phosphor/state/phosphor-state-manager-systemd-links.inc @@ -83,11 +83,6 @@ pkg_postinst_${PN}-obmc-targets_append() { TARGET="../obmc-host-force-warm-reboot@.target" ln -s $TARGET $LINK - mkdir -p $D$systemd_system_unitdir/obmc-host-diagnostic-mode@0.target.requires - LINK="$D$systemd_system_unitdir/obmc-host-diagnostic-mode@0.target.requires/obmc-host-force-warm-reboot@0.target" - TARGET="../obmc-host-force-warm-reboot@.target" - ln -s $TARGET $LINK - mkdir -p $D$systemd_system_unitdir/obmc-chassis-poweroff@0.target.wants LINK="$D$systemd_system_unitdir/obmc-chassis-poweroff@0.target.wants/phosphor-clear-one-time@0.service" TARGET="../phosphor-clear-one-time@.service" @@ -150,9 +145,6 @@ pkg_prerm_${PN}-obmc-targets_append() { LINK="$D$systemd_system_unitdir/obmc-host-warm-reboot@0.target.requires/obmc-host-force-warm-reboot@0.target" rm $LINK - LINK="$D$systemd_system_unitdir/obmc-host-diagnostic-mode@0.target.requires/obmc-host-force-warm-reboot@0.target" - rm $LINK - LINK="$D$systemd_system_unitdir/obmc-chassis-poweroff@0.target.wants/phosphor-clear-one-time@0.service" rm $LINK } -- cgit v1.2.3