From 4bfaa3f7df658c63293f25451d56784e55c235d6 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <holger@moiji-mobile.com>
Date: Wed, 16 Jul 2014 20:20:54 +0200
Subject: [PATCH] systemd: Enable the "ShutdownWatchDogSec" and add
 sysmocom-odu file

The TI Davinci DM644x and the TI Sierra AM335x both feature a
watchdog. Enable it on the AM335x as well. The next part is that
we can enable the watchdog for the shutdown. E.g. in case the
system does not reboot after the shutdown.

The shutdown is executed last and only after the shutdown target
has been reached. For time timeout we need to use the same interval
as the watchdog (as both drivers don't allow to change the timeout
interval).
---
 .../systemd/systemd/sysmobts-2050/system.conf |  2 +-
 .../systemd/systemd/sysmobts-v1/system.conf   |  2 +-
 .../systemd/systemd/sysmobts-v2/system.conf   |  2 +-
 .../systemd/systemd/sysmocom-odu/system.conf  | 43 +++++++++++++++++++
 recipes-fixes/systemd/systemd_sysmocom.inc    |  2 +-
 5 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 recipes-fixes/systemd/systemd/sysmocom-odu/system.conf

diff --git a/recipes-fixes/systemd/systemd/sysmobts-2050/system.conf b/recipes-fixes/systemd/systemd/sysmobts-2050/system.conf
index bfdf744..1932509 100644
--- a/recipes-fixes/systemd/systemd/sysmobts-2050/system.conf
+++ b/recipes-fixes/systemd/systemd/sysmobts-2050/system.conf
@@ -22,7 +22,7 @@ DefaultStandardOutput=syslog
 DefaultStandardError=syslog
 #JoinControllers=cpu,cpuacct,cpuset net_cls,net_prio
 RuntimeWatchdogSec=45
-#ShutdownWatchdogSec=10min
+ShutdownWatchdogSec=45
 #CapabilityBoundingSet=
 #TimerSlackNSec=
 #DefaultLimitCPU=
diff --git a/recipes-fixes/systemd/systemd/sysmobts-v1/system.conf b/recipes-fixes/systemd/systemd/sysmobts-v1/system.conf
index 04b57dc..7c3181f 100644
--- a/recipes-fixes/systemd/systemd/sysmobts-v1/system.conf
+++ b/recipes-fixes/systemd/systemd/sysmobts-v1/system.conf
@@ -22,7 +22,7 @@
 #DefaultStandardError=inherit
 #JoinControllers=cpu,cpuacct,cpuset net_cls,net_prio
 RuntimeWatchdogSec=45
-#ShutdownWatchdogSec=10min
+ShutdownWatchdogSec=45
 #CapabilityBoundingSet=
 #TimerSlackNSec=
 #DefaultLimitCPU=
diff --git a/recipes-fixes/systemd/systemd/sysmobts-v2/system.conf b/recipes-fixes/systemd/systemd/sysmobts-v2/system.conf
index 04b57dc..7c3181f 100644
--- a/recipes-fixes/systemd/systemd/sysmobts-v2/system.conf
+++ b/recipes-fixes/systemd/systemd/sysmobts-v2/system.conf
@@ -22,7 +22,7 @@
 #DefaultStandardError=inherit
 #JoinControllers=cpu,cpuacct,cpuset net_cls,net_prio
 RuntimeWatchdogSec=45
-#ShutdownWatchdogSec=10min
+ShutdownWatchdogSec=45
 #CapabilityBoundingSet=
 #TimerSlackNSec=
 #DefaultLimitCPU=
diff --git a/recipes-fixes/systemd/systemd/sysmocom-odu/system.conf b/recipes-fixes/systemd/systemd/sysmocom-odu/system.conf
new file mode 100644
index 0000000..ff9ecb8
--- /dev/null
+++ b/recipes-fixes/systemd/systemd/sysmocom-odu/system.conf
@@ -0,0 +1,43 @@
+#  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.
+#
+# See systemd.conf(5) for details
+
+[Manager]
+#LogLevel=info
+#LogTarget=journal-or-kmsg
+#LogColor=yes
+#LogLocation=no
+#DumpCore=yes
+#CrashShell=no
+#ShowStatus=yes
+#CrashChVT=1
+#CPUAffinity=1 2
+#DefaultControllers=cpu
+#DefaultStandardOutput=journal
+#DefaultStandardError=inherit
+#JoinControllers=cpu,cpuacct,cpuset net_cls,net_prio
+RuntimeWatchdogSec=60
+ShutdownWatchdogSec=60
+#CapabilityBoundingSet=
+#TimerSlackNSec=
+#DefaultLimitCPU=
+#DefaultLimitFSIZE=
+#DefaultLimitDATA=
+#DefaultLimitSTACK=
+#DefaultLimitCORE=
+#DefaultLimitRSS=
+#DefaultLimitNOFILE=
+#DefaultLimitAS=
+#DefaultLimitNPROC=
+#DefaultLimitMEMLOCK=
+#DefaultLimitLOCKS=
+#DefaultLimitSIGPENDING=
+#DefaultLimitMSGQUEUE=
+#DefaultLimitNICE=
+#DefaultLimitRTPRIO=
+#DefaultLimitRTTIME=
diff --git a/recipes-fixes/systemd/systemd_sysmocom.inc b/recipes-fixes/systemd/systemd_sysmocom.inc
index fb3ee5b..4a7eeab 100644
--- a/recipes-fixes/systemd/systemd_sysmocom.inc
+++ b/recipes-fixes/systemd/systemd_sysmocom.inc
@@ -1,7 +1,7 @@
 S_THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}"
 FILESPATH =. "${@base_set_filespath(["${S_THISDIR}/${PN}"], d)}:"
 
-PRINC="20"
+PRINC="21"
 
 SRC_URI += "file://journald.conf \
             file://0001-Feature-switch-ListenDatagram-from-run-systemd-journ.patch \