From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 19 Jun 2020 12:44:14 +0000 (+0000)
Subject: core174: Ship updated files from gcloud branch
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=0a0738618f3a87046a026c0ad5d193e8e25eff70

core174: Ship updated files from gcloud branch

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/config/rootfiles/core/147/filelists/files b/config/rootfiles/core/147/filelists/files
index 0062d9b3e5..fe33d7d716 100644
--- a/config/rootfiles/core/147/filelists/files
+++ b/config/rootfiles/core/147/filelists/files
@@ -2,5 +2,14 @@ etc/system-release
 etc/issue
 srv/web/ipfire/cgi-bin/credits.cgi
 var/ipfire/langs
+etc/rc.d/helper/aws-setup
+etc/rc.d/helper/gcp-setup
+etc/rc.d/init.d/cloud-init
 etc/rc.d/init.d/firewall
+etc/rc.d/init.d/functions
+etc/rc.d/init.d/networking/any
+etc/rc.d/init.d/networking/red
+etc/rc.d/init.d/partresize
 etc/sysctl.conf
+var/ipfire/header.pl
+var/ipfire/general-functions.pl
diff --git a/config/rootfiles/core/147/update.sh b/config/rootfiles/core/147/update.sh
index ad542c691d..8d8c040486 100644
--- a/config/rootfiles/core/147/update.sh
+++ b/config/rootfiles/core/147/update.sh
@@ -32,6 +32,8 @@ for (( i=1; i<=$core; i++ )); do
 done
 
 # Remove files
+rm -vf \
+	/var/ipfire/aws-functions.pl
 
 # Stop services
 /etc/init.d/squid stop