diff --git a/board/common/busybox_initramfs.config b/board/common/busybox_initramfs.config
index 675c0fd844..c08079b66e 100644
--- a/board/common/busybox_initramfs.config
+++ b/board/common/busybox_initramfs.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.24.2
-# Sat Feb 11 12:40:47 2017
+# Sat Feb 11 14:55:38 2017
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -159,8 +159,8 @@ CONFIG_GZIP_FAST=0
 # CONFIG_FEATURE_GZIP_LEVELS is not set
 # CONFIG_LZOP is not set
 # CONFIG_LZOP_COMPR_HIGH is not set
-# CONFIG_RPM2CPIO is not set
 # CONFIG_RPM is not set
+# CONFIG_RPM2CPIO is not set
 # CONFIG_TAR is not set
 # CONFIG_FEATURE_TAR_CREATE is not set
 # CONFIG_FEATURE_TAR_AUTODETECT is not set
@@ -456,8 +456,8 @@ CONFIG_INIT=y
 # CONFIG_FEATURE_KILL_REMOVED is not set
 CONFIG_FEATURE_KILL_DELAY=0
 CONFIG_FEATURE_INIT_SCTTY=y
-# CONFIG_FEATURE_INIT_SYSLOG is not set
-# CONFIG_FEATURE_EXTRA_QUIET is not set
+CONFIG_FEATURE_INIT_SYSLOG=y
+CONFIG_FEATURE_EXTRA_QUIET=y
 # CONFIG_FEATURE_INIT_COREDUMPS is not set
 CONFIG_FEATURE_INITRD=y
 CONFIG_INIT_TERMINAL_TYPE="linux"
@@ -992,21 +992,21 @@ CONFIG_SV_DEFAULT_SERVICE_DIR=""
 #
 # Shells
 #
-# CONFIG_ASH is not set
-# CONFIG_ASH_BASH_COMPAT is not set
+CONFIG_ASH=y
+CONFIG_ASH_BASH_COMPAT=y
 # CONFIG_ASH_IDLE_TIMEOUT is not set
-# CONFIG_ASH_JOB_CONTROL is not set
-# CONFIG_ASH_ALIAS is not set
-# CONFIG_ASH_GETOPTS is not set
-# CONFIG_ASH_BUILTIN_ECHO is not set
-# CONFIG_ASH_BUILTIN_PRINTF is not set
-# CONFIG_ASH_BUILTIN_TEST is not set
-# CONFIG_ASH_HELP is not set
-# CONFIG_ASH_CMDCMD is not set
+CONFIG_ASH_JOB_CONTROL=y
+CONFIG_ASH_ALIAS=y
+CONFIG_ASH_GETOPTS=y
+CONFIG_ASH_BUILTIN_ECHO=y
+CONFIG_ASH_BUILTIN_PRINTF=y
+CONFIG_ASH_BUILTIN_TEST=y
+CONFIG_ASH_HELP=y
+CONFIG_ASH_CMDCMD=y
 # CONFIG_ASH_MAIL is not set
-# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set
-# CONFIG_ASH_RANDOM_SUPPORT is not set
-# CONFIG_ASH_EXPAND_PRMT is not set
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+CONFIG_ASH_RANDOM_SUPPORT=y
+CONFIG_ASH_EXPAND_PRMT=y
 # CONFIG_CTTYHACK is not set
 # CONFIG_HUSH is not set
 # CONFIG_HUSH_BASH_COMPAT is not set
@@ -1025,18 +1025,18 @@ CONFIG_SV_DEFAULT_SERVICE_DIR=""
 # CONFIG_HUSH_EXPORT_N is not set
 # CONFIG_HUSH_MODE_X is not set
 # CONFIG_MSH is not set
-# CONFIG_FEATURE_SH_IS_ASH is not set
+CONFIG_FEATURE_SH_IS_ASH=y
 # CONFIG_FEATURE_SH_IS_HUSH is not set
-CONFIG_FEATURE_SH_IS_NONE=y
+# CONFIG_FEATURE_SH_IS_NONE is not set
 # CONFIG_FEATURE_BASH_IS_ASH is not set
 # CONFIG_FEATURE_BASH_IS_HUSH is not set
 CONFIG_FEATURE_BASH_IS_NONE=y
-# CONFIG_SH_MATH_SUPPORT is not set
-# CONFIG_SH_MATH_SUPPORT_64 is not set
-# CONFIG_FEATURE_SH_EXTRA_QUIET is not set
+CONFIG_SH_MATH_SUPPORT=y
+CONFIG_SH_MATH_SUPPORT_64=y
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
 # CONFIG_FEATURE_SH_STANDALONE is not set
 # CONFIG_FEATURE_SH_NOFORK is not set
-# CONFIG_FEATURE_SH_HISTFILESIZE is not set
+CONFIG_FEATURE_SH_HISTFILESIZE=y
 
 #
 # System Logging Utilities
diff --git a/board/common/overlay-initramfs/init b/board/common/overlay-initramfs/init
index db173d9345..382f85c886 100755
--- a/board/common/overlay-initramfs/init
+++ b/board/common/overlay-initramfs/init
@@ -1,8 +1,7 @@
 #!/bin/sh
 
-set -e
+PATH=/bin:/sbin:/usr/bin:/usr/sbin
 
-PATH=/bin
 BOOT_DEV=/dev/mmcblk0p1
 ROOT_DEV=/dev/mmcblk0p2
 DATA_DEV=/dev/mmcblk0p3
@@ -19,17 +18,17 @@ msg() {
 
 on_exit() {
     msg "Switching to normal boot"
-    /normal_boot
+    /remove_initramfs
 
-    msg "Syncing"
-    sync
-    
     msg "Unmounting data partition"
     umount /data
-
+    
     msg "Unmounting boot partition"
     umount /boot
     
+    msg "Syncing"
+    sync
+    
     msg "Rebooting"
     echo 'b' > /proc/sysrq-trigger
 }
@@ -44,27 +43,26 @@ mount -t devtmpfs devtmpfs /dev
 mount -t proc proc /proc
 
 msg "Mounting boot partition"
-mount $BOOT_DEV $BOOT
+mount $BOOT_DEV /boot
 
 msg "Mounting data partition"
-mount $DATA_DEV $DATA
+mount $DATA_DEV /data
 
 if ! [ -r $FW_DIR/$FW_FILE_EXTR ]; then
     msg "No firmware found, aborting"
-    normal_boot
+    exit 1
 fi
 
-if ! [ -r $FW_DIR/$ROOT_INFO ]; then
+if ! [ -r $FW_DIR/$ROOT_INFO_FILE ]; then
     msg "No root partition info, aborting"
-    normal_boot
+    exit 1
 fi
 
 msg "Copying root image"
-root_info=($(cat $FW_DIR/$ROOT_INFO))
-root_start=${root_info[0]}
-root_size=${root_info[1]}
+root_start=$(cat $FW_DIR/$ROOT_INFO_FILE | cut -d ' ' -f 1)
+root_size=$(cat $FW_DIR/$ROOT_INFOO_FILE | cut -d ' ' -f 2)
 
-dd if=$FW_DIR/$FW_FILE_EXTR skip=$root_start of=$ROOT_DEV bs=1048576 count=$root_size
+dd if=$FW_DIR/$FW_FILE_EXTR skip=$root_start of=$ROOT_DEV bs=1048576 count=$root_size || exit 1
 
 msg "Cleaning up"
 rm -rf $FW_DIR
diff --git a/board/raspberrypi/fwupdater.gz b/board/raspberrypi/fwupdater.gz
index e511d0ab76..d7a3017498 100644
Binary files a/board/raspberrypi/fwupdater.gz and b/board/raspberrypi/fwupdater.gz differ
diff --git a/board/raspberrypi2/fwupdater.gz b/board/raspberrypi2/fwupdater.gz
index e511d0ab76..d7a3017498 100644
Binary files a/board/raspberrypi2/fwupdater.gz and b/board/raspberrypi2/fwupdater.gz differ
diff --git a/board/raspberrypi3/fwupdater.gz b/board/raspberrypi3/fwupdater.gz
index e511d0ab76..d7a3017498 100644
Binary files a/board/raspberrypi3/fwupdater.gz and b/board/raspberrypi3/fwupdater.gz differ
diff --git a/configs/bananapi_defconfig b/configs/bananapi_defconfig
index 016dd7040b..d535d98149 100644
--- a/configs/bananapi_defconfig
+++ b/configs/bananapi_defconfig
@@ -37,6 +37,7 @@ BR2_PACKAGE_FFMPEG_SWSCALE=y
 BR2_PACKAGE_LIBWEBCAM=y
 BR2_PACKAGE_MOTION=y
 BR2_PACKAGE_GZIP=y
+BR2_PACKAGE_JQ=y
 BR2_PACKAGE_CIFS_UTILS=y
 # BR2_PACKAGE_E2FSPROGS_BADBLOCKS is not set
 # BR2_PACKAGE_E2FSPROGS_CHATTR is not set
diff --git a/configs/cubietruck_defconfig b/configs/cubietruck_defconfig
index f44f6d229a..f17adbc699 100644
--- a/configs/cubietruck_defconfig
+++ b/configs/cubietruck_defconfig
@@ -37,6 +37,7 @@ BR2_PACKAGE_FFMPEG_SWSCALE=y
 BR2_PACKAGE_LIBWEBCAM=y
 BR2_PACKAGE_MOTION=y
 BR2_PACKAGE_GZIP=y
+BR2_PACKAGE_JQ=y
 BR2_PACKAGE_CIFS_UTILS=y
 # BR2_PACKAGE_E2FSPROGS_BADBLOCKS is not set
 # BR2_PACKAGE_E2FSPROGS_CHATTR is not set
diff --git a/configs/odroidc1_defconfig b/configs/odroidc1_defconfig
index 6e0b26bd81..91413b3da7 100644
--- a/configs/odroidc1_defconfig
+++ b/configs/odroidc1_defconfig
@@ -41,6 +41,7 @@ BR2_PACKAGE_FFMPEG_NONFREE=y
 BR2_PACKAGE_FFMPEG_SWSCALE=y
 BR2_PACKAGE_MOTION=y
 BR2_PACKAGE_GZIP=y
+BR2_PACKAGE_JQ=y
 BR2_PACKAGE_CIFS_UTILS=y
 # BR2_PACKAGE_E2FSPROGS_BADBLOCKS is not set
 # BR2_PACKAGE_E2FSPROGS_CHATTR is not set
diff --git a/configs/odroidc2_defconfig b/configs/odroidc2_defconfig
index fd46a2aed9..2b93458cb1 100644
--- a/configs/odroidc2_defconfig
+++ b/configs/odroidc2_defconfig
@@ -30,6 +30,7 @@ BR2_PACKAGE_FFMPEG_NONFREE=y
 BR2_PACKAGE_FFMPEG_SWSCALE=y
 BR2_PACKAGE_MOTION=y
 BR2_PACKAGE_GZIP=y
+BR2_PACKAGE_JQ=y
 BR2_PACKAGE_CIFS_UTILS=y
 # BR2_PACKAGE_E2FSPROGS_BADBLOCKS is not set
 # BR2_PACKAGE_E2FSPROGS_CHATTR is not set
diff --git a/configs/odroidxu4_defconfig b/configs/odroidxu4_defconfig
index 50c9af0795..38f62eb079 100644
--- a/configs/odroidxu4_defconfig
+++ b/configs/odroidxu4_defconfig
@@ -32,6 +32,7 @@ BR2_PACKAGE_FFMPEG_NONFREE=y
 BR2_PACKAGE_FFMPEG_SWSCALE=y
 BR2_PACKAGE_MOTION=y
 BR2_PACKAGE_GZIP=y
+BR2_PACKAGE_JQ=y
 BR2_PACKAGE_CIFS_UTILS=y
 # BR2_PACKAGE_E2FSPROGS_BADBLOCKS is not set
 # BR2_PACKAGE_E2FSPROGS_CHATTR is not set
diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig
index 9fe2cfde4b..f07417dabe 100644
--- a/configs/raspberrypi2_defconfig
+++ b/configs/raspberrypi2_defconfig
@@ -37,6 +37,7 @@ BR2_PACKAGE_MOTION=y
 BR2_PACKAGE_MOTION_MMAL=y
 BR2_PACKAGE_STREAMEYE=y
 BR2_PACKAGE_GZIP=y
+BR2_PACKAGE_JQ=y
 BR2_PACKAGE_CIFS_UTILS=y
 # BR2_PACKAGE_E2FSPROGS_BADBLOCKS is not set
 # BR2_PACKAGE_E2FSPROGS_CHATTR is not set
diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig
index 115477516c..943e1cd086 100644
--- a/configs/raspberrypi3_defconfig
+++ b/configs/raspberrypi3_defconfig
@@ -37,6 +37,7 @@ BR2_PACKAGE_MOTION=y
 BR2_PACKAGE_MOTION_MMAL=y
 BR2_PACKAGE_STREAMEYE=y
 BR2_PACKAGE_GZIP=y
+BR2_PACKAGE_JQ=y
 BR2_PACKAGE_CIFS_UTILS=y
 # BR2_PACKAGE_E2FSPROGS_BADBLOCKS is not set
 # BR2_PACKAGE_E2FSPROGS_CHATTR is not set
diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig
index 34b2b0239e..a8852c9853 100644
--- a/configs/raspberrypi_defconfig
+++ b/configs/raspberrypi_defconfig
@@ -36,6 +36,7 @@ BR2_PACKAGE_MOTION=y
 BR2_PACKAGE_MOTION_MMAL=y
 BR2_PACKAGE_STREAMEYE=y
 BR2_PACKAGE_GZIP=y
+BR2_PACKAGE_JQ=y
 BR2_PACKAGE_CIFS_UTILS=y
 # BR2_PACKAGE_E2FSPROGS_BADBLOCKS is not set
 # BR2_PACKAGE_E2FSPROGS_CHATTR is not set