Merge remote-tracking branch 'origin/next'

diff --git a/config/rootfiles/core/152/exclude b/config/rootfiles/core/152/exclude
index e7500a03d20578431240e0adee044496493c47a6..818039f4af91e75f71ab41de8cd55c54b5274a62 100644 (file)
--- a/config/rootfiles/core/152/exclude
+++ b/config/rootfiles/core/152/exclude
@@ -17,6 +17,7 @@ etc/sysconfig/firewall.local
 etc/sysconfig/rc.local
 etc/udev/rules.d/30-persistent-network.rules
 srv/web/ipfire/html/proxy.pac
+usr/share/xt_geoip
 var/ipfire/dma
 var/ipfire/time
 var/ipfire/firewall/locationblock
@@ -25,6 +26,7 @@ var/ipfire/ovpn
 var/ipfire/urlfilter/blacklist
 var/ipfire/urlfilter/settings
 var/lib/alternatives
+var/lib/location/database.db
 var/log/cache
 var/log/dhcpcd.log
 var/log/messages

diff --git a/config/rootfiles/core/152/filelists/libloc b/config/rootfiles/core/152/filelists/libloc
new file mode 120000 (symlink)
index 0000000..ff4a924
--- /dev/null
+++ b/config/rootfiles/core/152/filelists/libloc
@@ -0,0 +1 @@
+../../../common/libloc
\ No newline at end of file