Revert "systemd: enable watchdog and set watchdog device to wdt2"
This reverts commit 9aeb8f0961e8d431192321c188af62b7e1831ad5.
Systemd is failing to ping the watchdog while shutting down, resulting
in a BMC reset during the shutdown. This results in an unclean shutdown
and side switching to the alternate BMC chip.
Resolves openbmc/openbmc#3094
Change-Id: I3ddc21a3cd3a1d63403786ca63c8671a72bd4c13
Signed-off-by: Eddie James <eajames@us.ibm.com>
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd/0001-Enable-watchdog-and-set-watchdog-device-to-watchdog1.patch b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd/0001-Enable-watchdog-and-set-watchdog-device-to-watchdog1.patch
deleted file mode 100644
index f9a15ca..0000000
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd/0001-Enable-watchdog-and-set-watchdog-device-to-watchdog1.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5ebfe83e2d407e946d47cbe3b589b638fc62f1ab Mon Sep 17 00:00:00 2001
-From: Eddie James <eajames@us.ibm.com>
-Date: Thu, 5 Apr 2018 12:40:20 -0500
-Subject: [PATCH] Enable watchdog and set watchdog device to watchdog1
-
----
- src/core/system.conf | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/core/system.conf b/src/core/system.conf
-index 746572b..d012216 100644
---- a/src/core/system.conf
-+++ b/src/core/system.conf
-@@ -24,8 +24,9 @@
- #CtrlAltDelBurstAction=reboot-force
- #CPUAffinity=1 2
- #JoinControllers=cpu,cpuacct net_cls,net_prio
--#RuntimeWatchdogSec=0
-+RuntimeWatchdogSec=20
- #ShutdownWatchdogSec=10min
-+WatchdogDevice=/dev/watchdog1
- #CapabilityBoundingSet=
- #SystemCallArchitectures=
- #TimerSlackNSec=
---
-1.8.3.1
-
diff --git a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend b/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend
deleted file mode 100644
index ca8e652..0000000
--- a/meta-openbmc-machines/meta-openpower/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://0001-Enable-watchdog-and-set-watchdog-device-to-watchdog1.patch"