commit 264303aac17fc131aa67152f39330bf4dcef4bbe
Author: Colin Walters <walters(a)verbum.org>
Date: Wed Mar 4 11:58:01 2015 -0500
atomic-vagrant: Mask cloud-init instead of using rm on /etc
Now that cloud-init is enabled in the systemd unit, that change
goes in /usr/lib...which we can't easily change. There are
two potentially sane solutions:
- Refactor the kickstarts here
- Some support for systemd presets in kickstart files would
allow us to have a later override here
fedora-cloud-atomic-vagrant.ks | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/fedora-cloud-atomic-vagrant.ks b/fedora-cloud-atomic-vagrant.ks
index caea274..b91c01f 100644
--- a/fedora-cloud-atomic-vagrant.ks
+++ b/fedora-cloud-atomic-vagrant.ks
@@ -11,7 +11,7 @@ user --name=vagrant --password=vagrant
# Work around cloud-init being both disabled and enabled; need
# to refactor to a common base.
-rm /etc/systemd/system/multi-user.target.wants/cloud-init* /etc/systemd/system/multi-user.target.wants/cloud-config*
+systemctl mask cloud-init cloud-init-local cloud-config cloud-final
# Vagrant setup
sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers