Blame SOURCES/0436-watchdog-Do-not-add-hooks-if-systemd-module-is-inclu.patch

a0a3b4
From e5439c9b3751dca1570c67d32a4ccc873c3c77a5 Mon Sep 17 00:00:00 2001
a0a3b4
From: Pratyush Anand <panand@redhat.com>
a0a3b4
Date: Wed, 16 Mar 2016 09:09:09 +0530
a0a3b4
Subject: [PATCH] watchdog: Do not add hooks if systemd module is included
a0a3b4
a0a3b4
When systemd is present, let it manage watchdog feed.
a0a3b4
a0a3b4
Signed-off-by: Pratyush Anand <panand@redhat.com>
a0a3b4
Cc: Dave Young <dyoung@redhat.com>
a0a3b4
Cc: Don Zickus <dzickus@redhat.com>
a0a3b4
Cc: Harald Hoyer <harald@redhat.com>
a0a3b4
---
a0a3b4
 modules.d/04watchdog/module-setup.sh | 5 +++++
a0a3b4
 1 file changed, 5 insertions(+)
a0a3b4
a0a3b4
diff --git a/modules.d/04watchdog/module-setup.sh b/modules.d/04watchdog/module-setup.sh
1755ca
index b7725ef7..7e32210e 100755
a0a3b4
--- a/modules.d/04watchdog/module-setup.sh
a0a3b4
+++ b/modules.d/04watchdog/module-setup.sh
a0a3b4
@@ -11,6 +11,11 @@ depends() {
a0a3b4
 }
a0a3b4
 
a0a3b4
 install() {
a0a3b4
+    # Do not add watchdog hooks if systemd module is included
a0a3b4
+    # In that case, systemd will manage watchdog kick
a0a3b4
+    if dracut_module_included "systemd"; then
a0a3b4
+	    return
a0a3b4
+    fi
a0a3b4
     inst_hook cmdline   00 "$moddir/watchdog.sh"
a0a3b4
     inst_hook cmdline   50 "$moddir/watchdog.sh"
a0a3b4
     inst_hook pre-trigger 00 "$moddir/watchdog.sh"