diff --git a/board/opendingux/gcw0/overlay/etc/init.d/S50bluetooth.sh b/board/opendingux/gcw0/overlay/etc/init.d/S50bluetooth.sh
index 49427ff90040..74d9b1dadbf1 100755
--- a/board/opendingux/gcw0/overlay/etc/init.d/S50bluetooth.sh
+++ b/board/opendingux/gcw0/overlay/etc/init.d/S50bluetooth.sh
@@ -18,5 +18,5 @@ case "$1" in
 		;;
 	*)
 		echo "Usage: $0 {start|stop}"
-		exit 1
+		${EXIT:-exit} 1
 esac
diff --git a/board/opendingux/gcw0/overlay/etc/init.d/S90volume.sh b/board/opendingux/gcw0/overlay/etc/init.d/S90volume.sh
index 57ae032523f8..7ea36a5ff850 100755
--- a/board/opendingux/gcw0/overlay/etc/init.d/S90volume.sh
+++ b/board/opendingux/gcw0/overlay/etc/init.d/S90volume.sh
@@ -28,5 +28,5 @@ case "$1" in
 		;;
 	*)
 		echo "Usage: $0 {start|stop}"
-		exit 1
+		${EXIT:-exit} 1
 esac
diff --git a/board/opendingux/lepus/overlay/etc/init.d/S90volume.sh b/board/opendingux/lepus/overlay/etc/init.d/S90volume.sh
index 39af4415ca49..9cdf2c3c3aca 100755
--- a/board/opendingux/lepus/overlay/etc/init.d/S90volume.sh
+++ b/board/opendingux/lepus/overlay/etc/init.d/S90volume.sh
@@ -19,5 +19,5 @@ case "$1" in
 		;;
 	*)
 		echo "Usage: $0 {start|stop}"
-		exit 1
+		${EXIT:-exit} 1
 esac
diff --git a/board/opendingux/rs90/overlay/etc/init.d/S49alsa-hack.sh b/board/opendingux/rs90/overlay/etc/init.d/S49alsa-hack.sh
index ffa8c972870c..1f0e3802bd19 100755
--- a/board/opendingux/rs90/overlay/etc/init.d/S49alsa-hack.sh
+++ b/board/opendingux/rs90/overlay/etc/init.d/S49alsa-hack.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-[ -z "$1" ] || [ "x$1" = "xstart" ] || exit 0
+[ -z "$1" ] || [ "x$1" = "xstart" ] || ${EXIT:-exit} 0
 
 psplash_write "Setup ALSA hack..."
 
diff --git a/board/opendingux/rs90/overlay/etc/init.d/S98usb.sh b/board/opendingux/rs90/overlay/etc/init.d/S98usb.sh
index 898d23808c27..eeb48afb365f 100755
--- a/board/opendingux/rs90/overlay/etc/init.d/S98usb.sh
+++ b/board/opendingux/rs90/overlay/etc/init.d/S98usb.sh
@@ -10,7 +10,7 @@ case "$MODEL" in
 	ylm,rs90)
 		;;
 	*)
-		return 0
+		${EXIT:-exit} 0
 		;;
 esac
 
diff --git a/board/opendingux/target_skeleton/etc/init.d/S02hugepages.sh b/board/opendingux/target_skeleton/etc/init.d/S02hugepages.sh
index f8d0c33e8b1b..d06605b82a00 100755
--- a/board/opendingux/target_skeleton/etc/init.d/S02hugepages.sh
+++ b/board/opendingux/target_skeleton/etc/init.d/S02hugepages.sh
@@ -3,7 +3,7 @@
 NR_HUGEPAGES=8
 [ -r /etc/default/hugepages ] && . /etc/default/hugepages
 
-[ -z "$1" ] || [ "x$1" = "xstart" ] || exit 0
+[ -z "$1" ] || [ "x$1" = "xstart" ] || ${EXIT:-exit} 0
 
 if [ -d /sys/kernel/mm/hugepages/hugepages-2048kB ] ; then
 	psplash_write "Configuring huge pages..."
diff --git a/board/opendingux/target_skeleton/etc/init.d/S02modules.sh b/board/opendingux/target_skeleton/etc/init.d/S02modules.sh
index a7e3ad9079e3..095d7c4d0d5d 100755
--- a/board/opendingux/target_skeleton/etc/init.d/S02modules.sh
+++ b/board/opendingux/target_skeleton/etc/init.d/S02modules.sh
@@ -11,7 +11,7 @@ case "$1" in
 
 		if [ "`grep '/lib/modules' /proc/mounts`" ] ; then
 			echo 'Modules filesystem is already mounted' >&2
-			exit 1
+			${EXIT:-exit} 1
 		fi
 
 		if [ -r "$MODULES_FILESYSTEM" ] ; then
@@ -29,5 +29,5 @@ case "$1" in
 
 	*)
 		echo "Usage: $0 {start|stop}"
-		exit 1
+		${EXIT:-exit} 1
 esac
diff --git a/board/opendingux/target_skeleton/etc/init.d/S03mountdata.sh b/board/opendingux/target_skeleton/etc/init.d/S03mountdata.sh
index 5e9d940ec382..5c0b8fc26c36 100755
--- a/board/opendingux/target_skeleton/etc/init.d/S03mountdata.sh
+++ b/board/opendingux/target_skeleton/etc/init.d/S03mountdata.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-[ -z "$1" ] || [ "x$1" = "xstart" ] || exit 0
+[ -z "$1" ] || [ "x$1" = "xstart" ] || ${EXIT:-exit} 0
 
 mkdir -p /media/data
 
diff --git a/board/opendingux/target_skeleton/etc/init.d/S04localfsinit.sh b/board/opendingux/target_skeleton/etc/init.d/S04localfsinit.sh
index 79ae057d54d8..a1ff4305b504 100755
--- a/board/opendingux/target_skeleton/etc/init.d/S04localfsinit.sh
+++ b/board/opendingux/target_skeleton/etc/init.d/S04localfsinit.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-[ -z "$1" ] || [ "x$1" = "xstart" ] || exit 0
+[ -z "$1" ] || [ "x$1" = "xstart" ] || ${EXIT:-exit} 0
 
 psplash_write "Initializing filesystem..."
 
diff --git a/board/opendingux/target_skeleton/etc/init.d/S05hostname.sh b/board/opendingux/target_skeleton/etc/init.d/S05hostname.sh
index 61f57489f52c..5e0c933c384d 100755
--- a/board/opendingux/target_skeleton/etc/init.d/S05hostname.sh
+++ b/board/opendingux/target_skeleton/etc/init.d/S05hostname.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-[ -z "$1" ] || [ "x$1" = "xstart" ] || exit 0
+[ -z "$1" ] || [ "x$1" = "xstart" ] || ${EXIT:-exit} 0
 
 IFS= read -r -d $'\0' MODEL </sys/firmware/devicetree/base/compatible
 
diff --git a/board/opendingux/target_skeleton/etc/init.d/S09passwd.sh b/board/opendingux/target_skeleton/etc/init.d/S09passwd.sh
index 7fff95b099a3..db42ee5e7bde 100755
--- a/board/opendingux/target_skeleton/etc/init.d/S09passwd.sh
+++ b/board/opendingux/target_skeleton/etc/init.d/S09passwd.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-[ -z "$1" ] || [ "x$1" = "xstart" ] || exit 0
+[ -z "$1" ] || [ "x$1" = "xstart" ] || ${EXIT:-exit} 0
 
 if [ ! -f /usr/local/etc/shadow ]; then
 	echo 'od:*:::::::' > /usr/local/etc/shadow
diff --git a/board/opendingux/target_skeleton/etc/init.d/S09swap.sh b/board/opendingux/target_skeleton/etc/init.d/S09swap.sh
index 903fd3b377a6..8090af863e7d 100755
--- a/board/opendingux/target_skeleton/etc/init.d/S09swap.sh
+++ b/board/opendingux/target_skeleton/etc/init.d/S09swap.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-[ -z "$1" ] || [ "x$1" = "xstart" ] || exit 0
+[ -z "$1" ] || [ "x$1" = "xstart" ] || ${EXIT:-exit} 0
 
 SWAP_PERCENT_MEM=80
 SWAPPINESS=20
@@ -9,7 +9,7 @@ SWAP_COMPRESSOR=lzo-rle
 # User overrides.
 [ -r /usr/local/etc/swap.conf ] && . /usr/local/etc/swap.conf
 
-[ $SWAP_PERCENT_MEM -gt 0 ] || return 0
+[ $SWAP_PERCENT_MEM -gt 0 ] || ${EXIT:-exit} 0
 
 psplash_write "Setup swap..."
 
diff --git a/board/opendingux/target_skeleton/etc/init.d/S49dropbear-keys.sh b/board/opendingux/target_skeleton/etc/init.d/S49dropbear-keys.sh
index c881bcb32a80..fc755f286d48 100755
--- a/board/opendingux/target_skeleton/etc/init.d/S49dropbear-keys.sh
+++ b/board/opendingux/target_skeleton/etc/init.d/S49dropbear-keys.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-[ -z "$1" ] || [ "x$1" = "xstart" ] || exit 0
+[ -z "$1" ] || [ "x$1" = "xstart" ] || ${EXIT:-exit} 0
 
 mkdir -p /etc/local/dropbear
 
diff --git a/board/opendingux/target_skeleton/etc/init.d/S90brightness.sh b/board/opendingux/target_skeleton/etc/init.d/S90brightness.sh
index 93c62d460120..4d4b8ee6f42b 100755
--- a/board/opendingux/target_skeleton/etc/init.d/S90brightness.sh
+++ b/board/opendingux/target_skeleton/etc/init.d/S90brightness.sh
@@ -22,5 +22,5 @@ case "$1" in
 		;;
 	*)
 		echo "Usage: $0 {start|stop}"
-		exit 1
+		${EXIT:-exit} 1
 esac
diff --git a/board/opendingux/target_skeleton/etc/init.d/S97perms.sh b/board/opendingux/target_skeleton/etc/init.d/S97perms.sh
index 18f61e08cfee..1fbe536a9e50 100755
--- a/board/opendingux/target_skeleton/etc/init.d/S97perms.sh
+++ b/board/opendingux/target_skeleton/etc/init.d/S97perms.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-[ -z "$1" ] || [ "x$1" = "xstart" ] || exit 0
+[ -z "$1" ] || [ "x$1" = "xstart" ] || ${EXIT:-exit} 0
 
 psplash_write "Setup permissions..."
 
diff --git a/package/initscripts/init.d/rcK b/package/initscripts/init.d/rcK
index 59e9c54ff913..1b07bd65fce0 100755
--- a/package/initscripts/init.d/rcK
+++ b/package/initscripts/init.d/rcK
@@ -12,11 +12,9 @@ for i in $(ls -r /etc/init.d/S??*) ;do
      case "$i" in
 	*.sh)
 	    # Source shell script for speed.
-	    (
-		trap - INT QUIT TSTP
+		EXIT=return
 		set stop
 		. $i
-	    )
 	    ;;
 	*)
 	    # No sh extension, so fork subprocess.
diff --git a/package/initscripts/init.d/rcS b/package/initscripts/init.d/rcS
index de411534dae3..3592d05a9f14 100755
--- a/package/initscripts/init.d/rcS
+++ b/package/initscripts/init.d/rcS
@@ -12,11 +12,9 @@ for i in /etc/init.d/S??* ;do
      case "$i" in
 	*.sh)
 	    # Source shell script for speed.
-	    (
-		trap - INT QUIT TSTP
+		EXIT=return
 		set start
 		. $i
-	    )
 	    ;;
 	*)
 	    # No sh extension, so fork subprocess.