From: Harald Hoyer <harald@redhat.com>
Date: Wed, 27 Jun 2012 15:06:23 +0000 (+0200)
Subject: watchdog: stop watchdog in emergency_shell
X-Git-Tag: 020~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=407fbc9e13ce20342ed7e7e93df7c6aed4c0451d;p=thirdparty%2Fdracut.git

watchdog: stop watchdog in emergency_shell
---

diff --git a/modules.d/04watchdog/module-setup.sh b/modules.d/04watchdog/module-setup.sh
index 8b8c09b73..5fc77f4e1 100755
--- a/modules.d/04watchdog/module-setup.sh
+++ b/modules.d/04watchdog/module-setup.sh
@@ -22,5 +22,6 @@ install() {
     inst_hook pre-pivot 99 "$moddir/watchdog.sh"
     inst_hook cleanup   00 "$moddir/watchdog.sh"
     inst_hook cleanup   99 "$moddir/watchdog.sh"
+    inst_hook emergency 02 "$moddir/watchdog-stop.sh"
 }
 
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
index e63f3f044..1ee671e01 100755
--- a/modules.d/99base/dracut-lib.sh
+++ b/modules.d/99base/dracut-lib.sh
@@ -856,8 +856,6 @@ emergency_shell()
             fi
             [ -c "$_ctty" ] || _ctty=/dev/tty1
             strstr "$(setsid --help 2>/dev/null)" "ctty" && CTTY="-c"
-        # stop watchdog
-            echo 'V' > /dev/watchdog
             setsid $CTTY /bin/sh -i -l 0<$_ctty 1>$_ctty 2>&1
         fi
     else