From 8b8ec439fa00a0119e548f435c37f0cfd8e66673 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 21 Nov 2017 11:58:25 +0100 Subject: [PATCH] neutrino: deactivate compatibility code in ExitRun(); ... our start script is aligned to new exit code 2 see https://bitbucket.org/neutrino-images/ni-buildsystem/commits/cd1328c41cb642c141b58d001dce06a96eff0a1c Signed-off-by: Thilo Graf Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/a857be6cc382553b3888b45cc8a856ab75fa8942 Author: vanhofen Date: 2017-11-21 (Tue, 21 Nov 2017) Origin message was: ------------------ - neutrino: deactivate compatibility code in ExitRun(); ... our start script is aligned to new exit code 2 see https://bitbucket.org/neutrino-images/ni-buildsystem/commits/cd1328c41cb642c141b58d001dce06a96eff0a1c Signed-off-by: Thilo Graf ------------------ This commit was generated by Migit --- src/neutrino.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index d0c389739..3e0f8832c 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -3811,6 +3811,7 @@ void CNeutrinoApp::ExitRun(int exit_code) if (!do_exiting) return; +#if 0 /* For compatibility: /tmp/.reboot is not really needed anymore if we use the defined exit code 2 instead of this flagfile. @@ -3824,6 +3825,7 @@ void CNeutrinoApp::ExitRun(int exit_code) } else unlink("/tmp/.reboot"); +#endif printf("[neutrino] %s(int %d)\n", __func__, exit_code); printf("[neutrino] hw_caps->can_shutdown: %d\n", g_info.hw_caps->can_shutdown);