The commit is pushed to "branch-rh7-3.10.0-229.7.2.vz7.9.x-ovz" and will appear
at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-229.7.2.vz7.9.10
------>
commit fe6dfdf7257892fe59c2dc6a88e3f197e85eca5e
Author: Pavel Tikhomirov <ptikhomi...@virtuozzo.com>
Date: Wed Nov 18 15:59:11 2015 +0400
fence-watchdog: Port: diff-fence-watchdog-rename-action-to-halt
Author: Dmitry Guryanov
Email: dgurya...@parallels.com
Subject: watchdog: rename action to halt
Date: Wed, 20 Feb 2013 18:22:01 +0400
We actually do halt, not poweroff, so rename action, because
otherwise it may confuse users.
Fix for https://jira.sw.ru/browse/PSBM-18395
Signed-off-by: Dmitry Guryanov <dgurya...@parallels.com>
Signed-off-by: Pavel Tikhomirov <ptikhomi...@virtuozzo.com>
Acked-by: Andrew Vagin <ava...@virtuozzo.com>
---
kernel/fence-watchdog.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/fence-watchdog.c b/kernel/fence-watchdog.c
index 7938fcb..e65e73d 100644
--- a/kernel/fence-watchdog.c
+++ b/kernel/fence-watchdog.c
@@ -27,7 +27,7 @@ enum {
FENCE_WDOG_POWEROFF = 2,
};
-const char *action_names[] = {"crash", "reboot", "poweroff", NULL};
+const char *action_names[] = {"crash", "reboot", "halt", NULL};
DEFINE_VVAR(volatile unsigned long, fence_wdog_jiffies64) = MAX_U64;
_______________________________________________
Devel mailing list
Devel@openvz.org
https://lists.openvz.org/mailman/listinfo/devel
