diff --git a/parental-control/Makefile b/parental-control/Makefile index e61ba0d94..1bca3447e 100644 --- a/parental-control/Makefile +++ b/parental-control/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=parental-control -PKG_VERSION:=1.4.5 +PKG_VERSION:=1.4.6 LOCAL_DEV:=0 ifneq ($(LOCAL_DEV),1) @@ -92,7 +92,6 @@ ifeq ($(CONFIG_PARENTAL_CONTROL_URLFILTERING),y) else $(BBFDM_INSTALL_MS_PLUGIN) -v ${VENDOR_PREFIX} ./files/urlbundle_override.json $(1) parentalcontrol endif - $(INSTALL_DATA) ./files/etc/uci-defaults/50-parental_control_disable_urlfilter $(1)/etc/uci-defaults/ endef $(eval $(call BuildPackage,parental-control)) diff --git a/parental-control/files/etc/config/parentalcontrol b/parental-control/files/etc/config/parentalcontrol index 4998803bc..24d47bac9 100644 --- a/parental-control/files/etc/config/parentalcontrol +++ b/parental-control/files/etc/config/parentalcontrol @@ -1,3 +1,4 @@ config globals 'globals' option enable '1' option loglevel '3' + option urlfilter '0' diff --git a/parental-control/files/etc/uci-defaults/40-parental_control_update_bundle_path b/parental-control/files/etc/uci-defaults/40-parental_control_update_bundle_path index b75bd99a1..b0bdfa166 100644 --- a/parental-control/files/etc/uci-defaults/40-parental_control_update_bundle_path +++ b/parental-control/files/etc/uci-defaults/40-parental_control_update_bundle_path @@ -25,14 +25,6 @@ check_mounted_app_partition() { if check_mounted_app_partition; then uci -q set parentalcontrol.globals.bundle_path="${APPS_DIR}/parentalcontrol" - - # configure the urlfilter if not configured - urlfilter="$(uci -q get parentalcontrol.globals.urlfilter)" - if [ -z "${urlfilter}" ]; then - uci -q set parentalcontrol.globals.urlfilter='1' - fi -else - uci -q set parentalcontrol.globals.urlfilter='0' fi exit 0 diff --git a/parental-control/files/etc/uci-defaults/50-parental_control_disable_urlfilter b/parental-control/files/etc/uci-defaults/50-parental_control_disable_urlfilter deleted file mode 100644 index 4be5d5182..000000000 --- a/parental-control/files/etc/uci-defaults/50-parental_control_disable_urlfilter +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -. /lib/functions.sh - -[ ! -f "/etc/config/parentalcontrol" ] && exit 0 - -uci -q set parentalcontrol.globals.urlfilter='0'