From a748814264f5c57b015a1fe541c7a0e5cffe2396 Mon Sep 17 00:00:00 2001
From: gixxpunk <thomas.harfmann@gmail.com>
Date: Wed, 18 Oct 2017 19:07:20 +0200
Subject: [PATCH] - prepare for release (will be reverted later)

---
 make/environment.mk                                | 2 +-
 make/ni.mk                                         | 2 +-
 skel-root/coolstream/hd1/etc/init.d/start_neutrino | 9 ---------
 skel-root/coolstream/hd2/etc/init.d/start_neutrino | 9 ---------
 4 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/make/environment.mk b/make/environment.mk
index 2793348b..62b82fb0 100644
--- a/make/environment.mk
+++ b/make/environment.mk
@@ -293,7 +293,7 @@ BITBUCKET_SSH		= git@bitbucket.org
 
 NI_GIT			= $(BITBUCKET_SSH):neutrino-images
 NI_NEUTRINO		= ni-neutrino-hd
-NI_NEUTRINO_BRANCH	?= ni/tuxbox
+NI_NEUTRINO_BRANCH	?= ni/pre-mp
 ifeq ($(USE_LIBSTB-HAL), yes)
   NI_NEUTRINO_BRANCH	:= ni/mp/tuxbox
 endif
diff --git a/make/ni.mk b/make/ni.mk
index 15481a5a..0b5588f8 100644
--- a/make/ni.mk
+++ b/make/ni.mk
@@ -30,7 +30,7 @@ ni-neutrino-full-updates:
 
 # -----------------------------------------------------------------------------
 
-BOXMODEL_IMAGE = apollo kronos kronos_v2 hd51
+BOXMODEL_IMAGE = apollo kronos kronos_v2
 ifneq ($(DEBUG), yes)
 	BOXMODEL_IMAGE += nevis
 endif
diff --git a/skel-root/coolstream/hd1/etc/init.d/start_neutrino b/skel-root/coolstream/hd1/etc/init.d/start_neutrino
index f3fc06e4..8b9e6466 100755
--- a/skel-root/coolstream/hd1/etc/init.d/start_neutrino
+++ b/skel-root/coolstream/hd1/etc/init.d/start_neutrino
@@ -5,12 +5,6 @@ touch /tmp/norestart
 until neutrino; do
 	RET=$?
 
-	# shutdown
-	if [ $RET -eq 1 ]; then
-		touch /tmp/.halt
-		break
-	fi
-
 	echo "Neutrino exited with exit code $RET"
 	dt -t"NEUTRINO: $RET"
 
@@ -28,7 +22,4 @@ done
 if [ -e /tmp/.reboot ]; then # gets created by neutrino
 	dt -t" ..REBOOT.."
 	reboot
-elif [ -e /tmp/.halt ]; then
-	dt -t"SHUTDOWN"
-	poweroff
 fi
diff --git a/skel-root/coolstream/hd2/etc/init.d/start_neutrino b/skel-root/coolstream/hd2/etc/init.d/start_neutrino
index fa0c50d6..0697c076 100755
--- a/skel-root/coolstream/hd2/etc/init.d/start_neutrino
+++ b/skel-root/coolstream/hd2/etc/init.d/start_neutrino
@@ -9,12 +9,6 @@ fi
 until neutrino; do
 	RET=$?
 
-	# shutdown
-	if [ $RET -eq 1 ]; then
-		touch /tmp/.halt
-		break
-	fi
-
 	echo "Neutrino exited with exit code $RET"
 	dt -t"NEUTRINO: $RET"
 
@@ -32,7 +26,4 @@ done
 if [ -e /tmp/.reboot ]; then # gets created by neutrino
 	dt -t" ..REBOOT.."
 	reboot
-elif [ -e /tmp/.halt ]; then
-	dt -t"SHUTDOWN"
-	poweroff
 fi