mirror of
https://dev.iopsys.eu/feed/iopsys.git
synced 2025-12-10 07:44:50 +01:00
Merge branch 'cherry-pick-82183e9e' into 'release-7.5'
parental-control: disable urlfilter by default See merge request feed/iopsys!1996
This commit is contained in:
commit
ab3b08bbe6
2 changed files with 1 additions and 8 deletions
|
|
@ -91,8 +91,8 @@ ifeq ($(CONFIG_PARENTAL_CONTROL_URLFILTERING),y)
|
||||||
$(INSTALL_DATA) ./files/etc/parentalcontrol/urlbundle_override.json $(1)/etc/parentalcontrol/
|
$(INSTALL_DATA) ./files/etc/parentalcontrol/urlbundle_override.json $(1)/etc/parentalcontrol/
|
||||||
else
|
else
|
||||||
$(BBFDM_INSTALL_MS_PLUGIN) -v ${VENDOR_PREFIX} ./files/urlbundle_override.json $(1) parentalcontrol
|
$(BBFDM_INSTALL_MS_PLUGIN) -v ${VENDOR_PREFIX} ./files/urlbundle_override.json $(1) parentalcontrol
|
||||||
$(INSTALL_DATA) ./files/etc/uci-defaults/50-parental_control_disable_urlfilter $(1)/etc/uci-defaults/
|
|
||||||
endif
|
endif
|
||||||
|
$(INSTALL_DATA) ./files/etc/uci-defaults/50-parental_control_disable_urlfilter $(1)/etc/uci-defaults/
|
||||||
endef
|
endef
|
||||||
|
|
||||||
$(eval $(call BuildPackage,parental-control))
|
$(eval $(call BuildPackage,parental-control))
|
||||||
|
|
|
||||||
|
|
@ -5,10 +5,3 @@
|
||||||
[ ! -f "/etc/config/parentalcontrol" ] && exit 0
|
[ ! -f "/etc/config/parentalcontrol" ] && exit 0
|
||||||
|
|
||||||
uci -q set parentalcontrol.globals.urlfilter='0'
|
uci -q set parentalcontrol.globals.urlfilter='0'
|
||||||
|
|
||||||
_delete_urlbundle() {
|
|
||||||
uci_remove parentalcontrol "${1}"
|
|
||||||
}
|
|
||||||
|
|
||||||
config_load "parentalcontrol"
|
|
||||||
config_foreach _delete_urlbundle urlbundle
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue