Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 860f01e9 authored by Valentin Vidic's avatar Valentin Vidic Committed by Corey Minyard
Browse files

ipmi/watchdog: fix watchdog timeout set on reboot 



systemd by default starts watchdog on reboot and sets the timer to
ShutdownWatchdogSec=10min.  Reboot handler in ipmi_watchdog than reduces
the timer to 120s which is not enough time to boot a Xen machine with
a lot of RAM.  As a result the machine is rebooted the second time
during the long run of (XEN) Scrubbing Free RAM.....

Fix this by setting the timer to 120s only if it was previously
set to a low value.

Signed-off-by: default avatarValentin Vidic <Valentin.Vidic@CARNet.hr>
Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
parent cf9806f3

drivers/char/ipmi/ipmi_watchdog.c

+4 −3
Original line number Diff line number Diff line
@@ -1163,9 +1163,10 @@ static int wdog_reboot_handler(struct notifier_block *this, 
			ipmi_watchdog_state = WDOG_TIMEOUT_NONE;

			ipmi_set_timeout(IPMI_SET_TIMEOUT_NO_HB);

		} else if (ipmi_watchdog_state != WDOG_TIMEOUT_NONE) {

			/* Set a long timer to let the reboot happens, but

			   reboot if it hangs, but only if the watchdog

			/* Set a long timer to let the reboot happen or

			   reset if it hangs, but only if the watchdog

			   timer was already running. */

			if (timeout < 120)

				timeout = 120;

			pretimeout = 0;

			ipmi_watchdog_state = WDOG_TIMEOUT_RESET;