summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilly Tu <wltu@google.com>2021-08-15 04:38:58 +0300
committerWilliam A. Kennington III <wak@google.com>2021-12-20 08:17:52 +0300
commit2696b0a16ced82722525754d241b5fb5f80790fd (patch)
treeaaffd0c74b8b5be0f435354669d64d5465a53f42
parent8b26979b24fe929cdb2edd27d8d11258bdcb75e1 (diff)
downloadopenbmc-2696b0a16ced82722525754d241b5fb5f80790fd.tar.xz
meta-google: Add new system.conf for gbmc-systemd-config
Add systemd.conf options for watchdog to replace watchdog-conf ``` // interval is 60s by default interval = 10 watchdog-device = /dev/watchdog // The value is in pages. They are presently 4KiB each. // Reset the BMC if it goes below 3MiB min-memory = 768 ``` Tested: ``` $ cat /lib/systemd/system.conf.d/40-system.conf [Manager] DefaultMemoryAccounting=yes RuntimeWatchdogSec=10s WatchdogDevice=/dev/watchdog ``` Change-Id: I51171746669dfeb1efe6c09952efa3457e33c86b Signed-off-by: Willy Tu <wltu@google.com>
-rw-r--r--meta-google/recipes-google/systemd/files/40-system.conf4
-rw-r--r--meta-google/recipes-google/systemd/gbmc-systemd-config.bb5
2 files changed, 9 insertions, 0 deletions
diff --git a/meta-google/recipes-google/systemd/files/40-system.conf b/meta-google/recipes-google/systemd/files/40-system.conf
new file mode 100644
index 000000000..5f770d01f
--- /dev/null
+++ b/meta-google/recipes-google/systemd/files/40-system.conf
@@ -0,0 +1,4 @@
+[Manager]
+DefaultMemoryAccounting=yes
+RuntimeWatchdogSec=10s
+WatchdogDevice=/dev/watchdog
diff --git a/meta-google/recipes-google/systemd/gbmc-systemd-config.bb b/meta-google/recipes-google/systemd/gbmc-systemd-config.bb
index 6e26fc99d..843053bc8 100644
--- a/meta-google/recipes-google/systemd/gbmc-systemd-config.bb
+++ b/meta-google/recipes-google/systemd/gbmc-systemd-config.bb
@@ -11,11 +11,13 @@ SRC_URI:append = " \
file://firmware-updates.target \
file://firmware-updates-pre.target \
file://40-gbmc-forward.conf \
+ file://40-system.conf \
"
FILES:${PN}:append = " \
${systemd_unitdir}/coredump.conf.d/40-gbmc-coredump.conf \
${systemd_unitdir}/resolved.conf.d/40-gbmc-nomdns.conf \
+ ${systemd_unitdir}/system.conf.d/40-system.conf \
${libdir}/sysctl.d/40-gbmc-forward.conf \
"
@@ -44,6 +46,9 @@ do_install() {
install -d -m0755 ${D}${libdir}/sysctl.d
install -m 0644 ${WORKDIR}/40-gbmc-forward.conf ${D}${libdir}/sysctl.d/
+
+ install -d -m 0755 ${D}${systemd_unitdir}/system.conf.d/
+ install -D -m0644 ${WORKDIR}/40-system.conf ${D}${systemd_unitdir}/system.conf.d/
}
do_install:append:dev() {