diff --git a/conf/base.config b/conf/base.config index 94ed23b..ac6deda 100644 --- a/conf/base.config +++ b/conf/base.config @@ -197,4 +197,10 @@ CONFIG_PACKAGE_luci-app-uugamebooster=y CONFIG_PACKAGE_luci-i18n-uugamebooster-zh-cn=y # haproxy -#CONFIG_PACKAGE_haproxy=y \ No newline at end of file +#CONFIG_PACKAGE_haproxy=y + +# 禁用默认包,和AdGuardHome冲突 +CONFIG_DEFAULT_luci-app-adbyby-plus=y +CONFIG_PACKAGE_luci-app-adbyby-plus=y +CONFIG_PACKAGE_luci-i18n-adbyby-plus-zh-cn=y +CONFIG_PACKAGE_adbyby=y \ No newline at end of file diff --git a/fw876 b/fw876 index dfb82d0..5790c63 160000 --- a/fw876 +++ b/fw876 @@ -1 +1 @@ -Subproject commit dfb82d0805346936f8e1338586834b3ae5057cca +Subproject commit 5790c633f31ed44110e9ca53e2c266182d2eb98c