mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2026-02-20 15:22:24 +01:00
a6edc4f2a3
Upgrade to cloud-init 21.4. Remove 02-hosts-template-fix.patch which was accepted upstream. Rename some existing patches. Add 06-ssh-fp-debug.patch.
36 lines
875 B
Diff
36 lines
875 B
Diff
From: Dermot Bradley <dermot_bradley@yahoo.com>
|
|
Date: Wed, 12 May 2021 00:14 +0100
|
|
Subject: [PATCH] cloud-init: Disable some modules not relevant to Alpine
|
|
|
|
Disable some cloud-init modules that are not (currently) relevant
|
|
to Alpine and which have been removed from the Alpine package.
|
|
|
|
---
|
|
|
|
diff -aur a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl
|
|
--- a/config/cloud.cfg.tmpl
|
|
+++ b/config/cloud.cfg.tmpl
|
|
@@ -105,8 +105,10 @@
|
|
- emit_upstart
|
|
- snap
|
|
{% endif %}
|
|
-{% if variant not in ["photon"] %}
|
|
+{% if variant not in ["alpine","photon"] %}
|
|
- ssh-import-id
|
|
+{% endif %}
|
|
+{% if variant not in ["photon"] %}
|
|
- locale
|
|
{% endif %}
|
|
- set-passwords
|
|
@@ -156,8 +158,10 @@
|
|
- chef
|
|
- mcollective
|
|
- salt-minion
|
|
+{% if variant not in ["alpine"] %}
|
|
- reset_rmc
|
|
- refresh_rmc_and_interface
|
|
+{% endif %}
|
|
- rightscale_userdata
|
|
- scripts-vendor
|
|
- scripts-per-once
|