From 17f71a1da5666763b52ddd443287a31109cf951e Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 10 May 2021 17:06:48 -0500 Subject: watchdog: hard code application path Per OpenBMC direction, hard code the path to the application Signed-off-by: Andrew Geissler Change-Id: I7dbbc9d8c353bc760d32e9cd106551a8bfab3838 --- .../watchdog/phosphor-watchdog/phosphor-watchdog@.service | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog') diff --git a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service index 52c129025..aab1ddbee 100644 --- a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service +++ b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service @@ -4,5 +4,4 @@ Description=Phosphor %I watchdog [Service] Restart=no EnvironmentFile={envfiledir}/obmc/watchdog/%I -ExecStart=/usr/bin/env phosphor-watchdog --continue --service=${{SERVICE}} --path=${{DEVPATH}} --target=${{TARGET}} -SyslogIdentifier=phosphor-watchdog +ExecStart=/usr/bin/phosphor-watchdog --continue --service=${{SERVICE}} --path=${{DEVPATH}} --target=${{TARGET}} -- cgit v1.2.3 From fb9869ff2816f52029c38b093d29e5a2c565d283 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 10 May 2021 16:03:43 -0500 Subject: watchdog: pass in default timeout on service start This commit will allow other meta layers to easily override the default timeout on watchdog start. Without passing the --min_interval option there is no way currently for other layers to change this on startup. Set the default of 30000 milliseconds to match the current default defined within the phosphor-dbus-interface. Signed-off-by: Andrew Geissler Change-Id: I6a25d5dd3da5704113c3f77d6f9737e0705b3d01 --- .../recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/poweron | 1 + .../watchdog/phosphor-watchdog/phosphor-watchdog@.service | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog') diff --git a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/poweron b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/poweron index 591d6dcd7..a972a470f 100644 --- a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/poweron +++ b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/obmc/watchdog/poweron @@ -1,3 +1,4 @@ DEVPATH=/xyz/openbmc_project/watchdog/host0 SERVICE=xyz.openbmc_project.Watchdog TARGET=obmc-host-timeout@0.target +TIMEOUT_IN_MSEC=30000 diff --git a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service index aab1ddbee..1f6590256 100644 --- a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service +++ b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service @@ -4,4 +4,4 @@ Description=Phosphor %I watchdog [Service] Restart=no EnvironmentFile={envfiledir}/obmc/watchdog/%I -ExecStart=/usr/bin/phosphor-watchdog --continue --service=${{SERVICE}} --path=${{DEVPATH}} --target=${{TARGET}} +ExecStart=/usr/bin/phosphor-watchdog --continue --service=${{SERVICE}} --path=${{DEVPATH}} --target=${{TARGET}} --min_interval=${{TIMEOUT_IN_MSEC}} -- cgit v1.2.3 From 07b0f0f6ca9bfe4a4f28d8bf7e7c4464b514a989 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 4 Jun 2021 09:13:46 -0500 Subject: watchdog: utilize new default_interval parameter Commit fb9869ff introduced the concept of passing in a default interval timeout to the watchdog application on startup. This utilized the existing --min_interval option. This worked ok but it limited the ability of external users to reduce the interval. Give the above limitation, a new feature was added to phosphor-watchdog which allows the user to explicitly set the default interval on startup in the following commit: https://github.com/openbmc/phosphor-watchdog/commit/afc369ad548137a5fdb0bc69b6606e2aafa7182b Utilize this new parameter to set the default interval on startup. Signed-off-by: Andrew Geissler Change-Id: Ia21dc7bb9dec50f3ec044c6d1733a54bcea15298 --- .../watchdog/phosphor-watchdog/phosphor-watchdog@.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog') diff --git a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service index 1f6590256..e559d9fab 100644 --- a/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service +++ b/meta-phosphor/recipes-phosphor/watchdog/phosphor-watchdog/phosphor-watchdog@.service @@ -4,4 +4,4 @@ Description=Phosphor %I watchdog [Service] Restart=no EnvironmentFile={envfiledir}/obmc/watchdog/%I -ExecStart=/usr/bin/phosphor-watchdog --continue --service=${{SERVICE}} --path=${{DEVPATH}} --target=${{TARGET}} --min_interval=${{TIMEOUT_IN_MSEC}} +ExecStart=/usr/bin/phosphor-watchdog --continue --service=${{SERVICE}} --path=${{DEVPATH}} --target=${{TARGET}} --default_interval=${{TIMEOUT_IN_MSEC}} -- cgit v1.2.3