Revert "systemd: Configure shutdown watchdog to 20min"
Resolves openbmc/openbmc#1938
This reverts commit 45af9a22aabf38474a00698f511e334c14d84c76.
Change-Id: I482d8b14ce1cfcb9022973a9412adff46f458f5f
Signed-off-by: Charles Paul Hofer <Charles.Hofer@ibm.com>
diff --git a/common/recipes-core/systemd/systemd/shutdown-watchdog.conf b/common/recipes-core/systemd/systemd/shutdown-watchdog.conf
deleted file mode 100644
index a956f83..0000000
--- a/common/recipes-core/systemd/systemd/shutdown-watchdog.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is part of systemd.
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# Entries in this file show the compile time defaults.
-# You can change settings by editing this file.
-# Defaults can be restored by simply deleting this file.
-#
-# See systemd-system.conf(5) for details.
-
-[Manager]
-ShutdownWatchdogSec=20min
diff --git a/common/recipes-core/systemd/systemd_%.bbappend b/common/recipes-core/systemd/systemd_%.bbappend
index 8c2ae85..e2db9c7 100644
--- a/common/recipes-core/systemd/systemd_%.bbappend
+++ b/common/recipes-core/systemd/systemd_%.bbappend
@@ -6,7 +6,6 @@
quotacheck kdbus ima smack polkit logind bootchart utmp"
FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
SRC_URI += "file://default.network"
-SRC_URI += "file://shutdown-watchdog.conf"
SRC_URI += "file://0001-Export-message_append_cmdline.patch"
SRC_URI += "file://0002-systemd-Make-pam-compile-shared-library.patch"
SRC_URI += "file://0003-basic-Factor-out-string-checking-from-name_to_prefix.patch"
@@ -19,13 +18,11 @@
RRECOMMENDS_${PN} += "obmc-targets"
FILES_${PN} += "${libdir}/systemd/network/default.network"
-FILES_${PN} += "${libdir}/systemd/system.conf.d/shutdown-watchdog.conf"
EXTRA_OECONF += " --disable-hwdb"
do_install_append() {
install -m 644 ${WORKDIR}/default.network ${D}${libdir}/systemd/network/
- install -m 644 -D ${WORKDIR}/shutdown-watchdog.conf ${D}${libdir}/systemd/system.conf.d/shutdown-watchdog.conf
#TODO Remove after this issue is resolved
#https://github.com/openbmc/openbmc/issues/152