meta-facebook: systemd: remove watchdog override
Watchdog enable is now handled at a meta-phosphor level.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I47f3e9c33ba4b010e703ed550e6b2801c8d08337
diff --git a/meta-facebook/recipes-core/systemd/systemd/40-system.conf b/meta-facebook/recipes-core/systemd/systemd/40-system.conf
deleted file mode 100644
index 2e8ebda..0000000
--- a/meta-facebook/recipes-core/systemd/systemd/40-system.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[Manager]
-RuntimeWatchdogSec=90s
-WatchdogDevice=/dev/watchdog
diff --git a/meta-facebook/recipes-core/systemd/systemd_%.bbappend b/meta-facebook/recipes-core/systemd/systemd_%.bbappend
deleted file mode 100644
index 08f3f45..0000000
--- a/meta-facebook/recipes-core/systemd/systemd_%.bbappend
+++ /dev/null
@@ -1,14 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-
-SRC_URI:append = " \
- file://40-system.conf \
- "
-
-FILES:${PN}:append = " \
- ${systemd_unitdir}/system.conf.d/40-system.conf \
- "
-
-do_install:append() {
- install -d -m 0755 ${D}${systemd_unitdir}/system.conf.d/
- install -m 0644 ${WORKDIR}/40-system.conf ${D}${systemd_unitdir}/system.conf.d/
-}