From a406a11d2f6156fdf8feeae82af612da5127f316 Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Mon, 12 Dec 2016 22:02:26 +0200
Subject: [PATCH] fixed admin password not being updated

---
 board/common/overlay/etc/init.d/adminpw | 2 +-
 board/common/overlay/etc/version        | 2 +-
 package/motioneye/motioneye.mk          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/board/common/overlay/etc/init.d/adminpw b/board/common/overlay/etc/init.d/adminpw
index d51501c74b..8e45d40e1c 100755
--- a/board/common/overlay/etc/init.d/adminpw
+++ b/board/common/overlay/etc/init.d/adminpw
@@ -1,6 +1,6 @@
 #!/bin/bash
 
 if [ -f /data/etc/motion.conf ]; then
-    cat /data/etc/motion.conf | grep admin_password | cut -d ' ' -f 3-
+    cat /data/etc/motion.conf | grep admin_password | grep -v _hash | cut -d ' ' -f 3-
 fi
 
diff --git a/board/common/overlay/etc/version b/board/common/overlay/etc/version
index 07502041a2..7961c31b84 100644
--- a/board/common/overlay/etc/version
+++ b/board/common/overlay/etc/version
@@ -1,4 +1,4 @@
 os_name="motionEyeOS"
 os_short_name="motioneyeos"
 os_prefix="meye"
-os_version="20161125"
+os_version="20161212"
diff --git a/package/motioneye/motioneye.mk b/package/motioneye/motioneye.mk
index f79503692d..6759333928 100644
--- a/package/motioneye/motioneye.mk
+++ b/package/motioneye/motioneye.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MOTIONEYE_VERSION = 0a315ef637be5ca96c700c7bb5af690954608acd
+MOTIONEYE_VERSION = 7bbc96f32e89f9e7750664cd1a0912bfbf428b7b
 MOTIONEYE_SITE = $(call github,ccrisan,motioneye,$(MOTIONEYE_VERSION))
 MOTIONEYE_SOURCE = $(MOTIONEYE_VERSION).tar.gz
 MOTIONEYE_LICENSE = GPLv3