start core149 and add oci changes.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

config/rootfiles/core/148/filelists/Locale-Country

@@ -1 +0,0 @@
-../../../common/Locale-Country

config/rootfiles/core/148/filelists/files

@@ -1,30 +0,0 @@
-etc/system-release
-etc/issue
-srv/web/ipfire/cgi-bin/credits.cgi
-var/ipfire/langs
-etc/rc.d/init.d/firewall
-etc/rc.d/init.d/networking/any
-srv/web/ipfire/cgi-bin/connections.cgi
-srv/web/ipfire/cgi-bin/country.cgi
-srv/web/ipfire/cgi-bin/dns.cgi
-srv/web/ipfire/cgi-bin/firewall.cgi
-srv/web/ipfire/cgi-bin/fwhosts.cgi
-srv/web/ipfire/cgi-bin/ipinfo.cgi
-srv/web/ipfire/cgi-bin/location-block.cgi
-srv/web/ipfire/cgi-bin//logs.cgi/firewalllog.dat
-srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat
-srv/web/ipfire/cgi-bin/logs.cgi/firewalllogip.dat
-srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat
-srv/web/ipfire/cgi-bin/netexternal.cgi
-srv/web/ipfire/cgi-bin/ovpnmain.cgi
-srv/web/ipfire/cgi-bin/remote.cgi
-srv/web/ipfire/cgi-bin/tor.cgi
-usr/lib/firewall/firewall-lib.pl
-usr/lib/firewall/rules.pl
-usr/local/bin/convert-to-location
-usr/local/bin/update-location-database
-var/ipfire/backup/bin/backup.pl
-var/ipfire/firewall/locationblock
-var/ipfire/location-functions.pl
-var/ipfire/network-functions.pl
-var/ipfire/menu.d/50-firewall.menu

config/rootfiles/core/148/filelists/libloc

@@ -1 +0,0 @@
-../../../common/libloc

config/rootfiles/core/148/filelists/xtables-addons

@@ -1 +0,0 @@
-../../../common/xtables-addons

config/rootfiles/core/149/filelists/files

@@ -0,0 +1,8 @@
+etc/system-release
+etc/issue
+srv/web/ipfire/cgi-bin/credits.cgi
+var/ipfire/langs
+etc/rc.d/helper/oci-setup
+etc/rc.d/init.d/cloud-init
+etc/rc.d/init.d/functions
+etc/rc.d/init.d/smt

config/rootfiles/core/149/update.sh

@@ -24,7 +24,7 @@
 . /opt/pakfire/lib/functions.sh
 /usr/local/bin/backupctrl exclude >/dev/null 2>&1
 
-core=148
+core=149
 
 # Remove old core updates from pakfire cache to save space...
 for (( i=1; i<=$core; i++ )); do
@@ -32,15 +32,7 @@ for (( i=1; i<=$core; i++ )); do
 done
 
 # Remove files
-rm -vf \
-	/etc/rc.d/init.d/networking/red.ip/99-geoip-database \
-	/srv/web/ipfire/cgi-bin/geoip-block.cgi \
-	/usr/lib/libGeoIP*
-	/usr/lib/perl5/site_perl/5.30.0/Geo \
-	/usr/share/GeoIP \
-	/var/lib/GoIP \
-	/usr/local/bin/xt_geoip* \
-	/var/ipfire/geoip-functions.pl \
+#rm -vf \
 
 # Stop services
 
@@ -50,9 +42,6 @@ extract_files
 # update linker config
 ldconfig
 
-# update location database
-/usr/local/bin/convert-to-location
-
 # Update Language cache
 /usr/local/bin/update-lang-cache