From 89da227de991ef3c1bb9ad3dc4f23d07535317d2 Mon Sep 17 00:00:00 2001

From: Pratyush Anand <panand@redhat.com>

Date: Wed, 16 Mar 2016 09:09:09 +0530

Subject: [PATCH] watchdog: Do not add hooks if systemd module is included

When systemd is present, let it manage watchdog feed.

Signed-off-by: Pratyush Anand <panand@redhat.com>

Cc: Dave Young <dyoung@redhat.com>

Cc: Don Zickus <dzickus@redhat.com>

Cc: Harald Hoyer <harald@redhat.com>

---

 modules.d/04watchdog/module-setup.sh | 5 +++++

 1 file changed, 5 insertions(+)

diff --git a/modules.d/04watchdog/module-setup.sh b/modules.d/04watchdog/module-setup.sh

index 576c589..7ec757a 100755

--- a/modules.d/04watchdog/module-setup.sh

+++ b/modules.d/04watchdog/module-setup.sh

@@ -12,6 +12,11 @@ depends() {

 # called by dracut

 install() {

+    # Do not add watchdog hooks if systemd module is included

+    # In that case, systemd will manage watchdog kick

+    if dracut_module_included "systemd"; then

+	    return

+    fi

     inst_hook cmdline   00 "$moddir/watchdog.sh"

     inst_hook cmdline   50 "$moddir/watchdog.sh"

     inst_hook pre-trigger 00 "$moddir/watchdog.sh"