core135: Ship cloud-init changes

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

diff --git a/config/rootfiles/core/135/filelists/files b/config/rootfiles/core/135/filelists/files
index ed58dc26d35cf9b202b62e707a8922701b5eaf7e..50bf616b0d529f79d5e21e18dab22dfbc32d3d78 100644 (file)
--- a/config/rootfiles/core/135/filelists/files
+++ b/config/rootfiles/core/135/filelists/files
@@ -2,4 +2,8 @@ etc/system-release
 etc/issue
 srv/web/ipfire/cgi-bin/credits.cgi
 var/ipfire/langs
+etc/rc.d/helper/azure-setup
+etc/rc.d/init.d/cloud-init
+etc/rc.d/init.d/functions
+etc/rc.d/init.d/partresize
 etc/rc.d/init.d/unbound

diff --git a/config/rootfiles/core/135/update.sh b/config/rootfiles/core/135/update.sh
index 80a32254063b3efba1bdaa7f2b06d37c08d6205d..dd79f65af849982dedcc79cd56b7b457f7969041 100644 (file)
--- a/config/rootfiles/core/135/update.sh
+++ b/config/rootfiles/core/135/update.sh
@@ -31,13 +31,16 @@ for (( i=1; i<=$core; i++ )); do
        rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
 done
 
+# Remove files
+rm -vf \
+       /etc/rc.d/init.d/aws \
+       /etc/rc.d/rcsysinit.d/S74aws
+
 # Stop services
 
 # Extract files
 extract_files
 
-# create main/security file
-
 # update linker config
 ldconfig