From 4a42f66223cfc273aa08cd461903090907a0ac6e Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 13 Dec 2016 08:56:01 -0500 Subject: [PATCH] fedora-atomic-vagrant: Sync with CentOS Atomic SIG I'm trying to keep things in sync - this mostly ensures the root password is unlocked, and drops the `services` line that is useless because that's not how kickstart inheritance works. --- fedora-atomic-vagrant.ks | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/fedora-atomic-vagrant.ks b/fedora-atomic-vagrant.ks index 822311a..1adefc4 100644 --- a/fedora-atomic-vagrant.ks +++ b/fedora-atomic-vagrant.ks @@ -1,10 +1,8 @@ -# Like the Atomic cloud image, but tuned for vagrant. Enable -# the vagrant user, disable cloud-init. +# Like the Atomic Host cloud image, but tuned for vagrant: enable the +# vagrant user, disable cloud-init. %include fedora-atomic.ks -services --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final - user --name=vagrant --password=vagrant rootpw vagrant @@ -14,13 +12,16 @@ rootpw vagrant # platforms (virtualbox and kvm) bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0" - %post --erroronfail # Work around cloud-init being both disabled and enabled; need # to refactor to a common base. systemctl mask cloud-init cloud-init-local cloud-config cloud-final +# The inherited cloud %post locks the passwd, but we want it +# unlocked for vagrant, just like downstream. +passwd -u root + # Vagrant setup sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers echo 'vagrant ALL=NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd