git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 From c1fe14fa5bd168292cc4670034bc48b954e9dac7 Mon Sep 17 00:00:00 2001
   2 From: "Maxin B. John" <maxin.john@intel.com>
   3 Date: Tue, 13 Mar 2018 14:49:55 +0200
   4 Subject: [PATCH] watchdog: remove interdependencies of watchdog and
   5  wd_keepalive services
   6
   7 Since watchdog and watchdog-keepalive packages can't be installed
   8 together, remove the inter-dependencies of watchdog and wd_keepalive
   9 services
  10
  11 Upstream-Status: Inappropriate [oe specific]
  12
  13 Signed-off-by: Maxin B. John <maxin.john@intel.com>
  14 ---
  15  debian/watchdog.service     |  9 +++------
  16  debian/wd_keepalive.service | 10 +++++-----
  17  2 files changed, 8 insertions(+), 11 deletions(-)
  18
  19 diff --git a/debian/watchdog.service b/debian/watchdog.service
  20 index 7a2fc36..f31d1fe 100644
  21 --- a/debian/watchdog.service
  22 +++ b/debian/watchdog.service
  23 @@ -1,16 +1,13 @@
  24  [Unit]
  25  Description=watchdog daemon
  26 -Conflicts=wd_keepalive.service
  27  After=multi-user.target
  28 -OnFailure=wd_keepalive.service
  29
  30  [Service]
  31  Type=forking
  32  EnvironmentFile=/etc/default/watchdog
  33  ExecStartPre=/bin/sh -c '[ -z "${watchdog_module}" ] || [ "${watchdog_module}" = "none" ] || /sbin/modprobe $watchdog_module'
  34 -ExecStart=/bin/sh -c '[ $run_watchdog != 1 ] || exec /usr/sbin/watchdog $watchdog_options'
  35 -ExecStopPost=/bin/sh -c '[ $run_wd_keepalive != 1 ] || false'
  36 +ExecStart=/bin/sh -c '[ x$run_watchdog != x1 ] || exec /usr/sbin/watchdog $watchdog_options'
  37 +PIDFile=/var/run/watchdog.pid
  38
  39  [Install]
  40 -WantedBy=default.target
  41 -
  42 +WantedBy=multi-user.target
  43 diff --git a/debian/wd_keepalive.service b/debian/wd_keepalive.service
  44 index 45b018e..7f8b1dc 100644
  45 --- a/debian/wd_keepalive.service
  46 +++ b/debian/wd_keepalive.service
  47 @@ -1,13 +1,13 @@
  48  [Unit]
  49  Description=watchdog keepalive daemon
  50 -Before=watchdog.service shutdown.target
  51 -Conflicts=watchdog.service shutdown.target
  52 +After=multi-user.target
  53
  54  [Service]
  55  Type=forking
  56  EnvironmentFile=/etc/default/watchdog
  57  ExecStartPre=/bin/sh -c '[ -z "${watchdog_module}" ] || [ "${watchdog_module}" = "none" ] || /sbin/modprobe $watchdog_module'
  58 -ExecStartPre=-/bin/systemctl reset-failed watchdog.service
  59  ExecStart=/usr/sbin/wd_keepalive $watchdog_options
  60 -ExecStartPost=/bin/sh -c 'ln -s /var/run/wd_keepalive.pid /run/sendsigs.omit.d/wd_keepalive.pid'
  61 -ExecStopPost=/bin/sh -c 'rm -f /run/sendsigs.omit.d/wd_keepalive.pid'
  62 +PIDFile=/var/run/wd_keepalive.pid
  63 +
  64 +[Install]
  65 +WantedBy=multi-user.target
  66 --
  67 2.4.0
  68