Merge upgrade-to-244 into tizen

Change-Id: Id141f6a5f624ba6a4a24b0bf85a20b7e51878781
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>

diff --git a/src/core/main.c b/src/core/main.c
index 022bfee..a3ccae9 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -2123,7 +2123,7 @@ static void reset_arguments(void) {
         arg_default_start_limit_interval = DEFAULT_START_LIMIT_INTERVAL;
         arg_default_start_limit_burst = DEFAULT_START_LIMIT_BURST;
         arg_runtime_watchdog = 0;
-        arg_reboot_watchdog = 10 * USEC_PER_MINUTE;
+        arg_reboot_watchdog = 0; /* 10 * USEC_PER_MINUTE; */
         arg_kexec_watchdog = 0;
         arg_early_core_pattern = NULL;
         arg_watchdog_device = NULL;