You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
32 lines
1.1 KiB
32 lines
1.1 KiB
6 years ago
|
From e5439c9b3751dca1570c67d32a4ccc873c3c77a5 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 b7725ef7..7e32210e 100755
|
||
|
|
--- a/modules.d/04watchdog/module-setup.sh
|
||
|
|
+++ b/modules.d/04watchdog/module-setup.sh
|
||
|
|
@@ -11,6 +11,11 @@ depends() {
|
||
|
|
}
|
||
|
|
|
||
|
|
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"
|