From: Pratyush Anand <panand@redhat.com>
Date: Wed, 16 Mar 2016 03:39:09 +0000 (+0530)
Subject: watchdog: Do not add hooks if systemd module is included
X-Git-Tag: 045~172^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=89da227de991ef3c1bb9ad3dc4f23d07535317d2;p=thirdparty%2Fdracut.git

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>
---

diff --git a/modules.d/04watchdog/module-setup.sh b/modules.d/04watchdog/module-setup.sh
index 576c589c1..7ec757aec 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"