Revert "- prepare for release (will be reverted later)"

This reverts commit a748814264.

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/pre-mp
+NI_NEUTRINO_BRANCH	?= ni/tuxbox
 ifeq ($(USE_LIBSTB-HAL), yes)
   NI_NEUTRINO_BRANCH	:= ni/mp/tuxbox
 endif

make/ni.mk

@@ -30,7 +30,7 @@ ni-neutrino-full-updates:
 
 # -----------------------------------------------------------------------------
 
-BOXMODEL_IMAGE = apollo kronos kronos_v2
+BOXMODEL_IMAGE = apollo kronos kronos_v2 hd51
 ifneq ($(DEBUG), yes)
 	BOXMODEL_IMAGE += nevis
 endif

skel-root/coolstream/hd1/etc/init.d/start_neutrino

@@ -5,6 +5,12 @@ 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"
 
@@ -22,4 +28,7 @@ done
 if [ -e /tmp/.reboot ]; then # gets created by neutrino
 	dt -t" ..REBOOT.."
 	reboot
+elif [ -e /tmp/.halt ]; then
+	dt -t"SHUTDOWN"
+	poweroff
 fi

skel-root/coolstream/hd2/etc/init.d/start_neutrino

@@ -9,6 +9,12 @@ 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"
 
@@ -26,4 +32,7 @@ done
 if [ -e /tmp/.reboot ]; then # gets created by neutrino
 	dt -t" ..REBOOT.."
 	reboot
+elif [ -e /tmp/.halt ]; then
+	dt -t"SHUTDOWN"
+	poweroff
 fi