From e1206f4b9bad694c75726c0ff05ac9853fb75b10 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 12 Apr 2016 10:07:07 -0500 Subject: [PATCH] update the atomic cloud images for f24 Signed-off-by: Dennis Gilmore --- fedora-cloud-atomic-vagrant.ks => fedora-atomic-vagrant.ks | 2 +- fedora-cloud-atomic.ks => fedora-atomic.ks | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename fedora-cloud-atomic-vagrant.ks => fedora-atomic-vagrant.ks (98%) rename fedora-cloud-atomic.ks => fedora-atomic.ks (96%) diff --git a/fedora-cloud-atomic-vagrant.ks b/fedora-atomic-vagrant.ks similarity index 98% rename from fedora-cloud-atomic-vagrant.ks rename to fedora-atomic-vagrant.ks index 0ad0586..822311a 100644 --- a/fedora-cloud-atomic-vagrant.ks +++ b/fedora-atomic-vagrant.ks @@ -1,7 +1,7 @@ # Like the Atomic cloud image, but tuned for vagrant. Enable # the vagrant user, disable cloud-init. -%include fedora-cloud-atomic.ks +%include fedora-atomic.ks services --disabled=cloud-init,cloud-init-local,cloud-config,cloud-final diff --git a/fedora-cloud-atomic.ks b/fedora-atomic.ks similarity index 96% rename from fedora-cloud-atomic.ks rename to fedora-atomic.ks index 2caa8ce..adadbeb 100644 --- a/fedora-cloud-atomic.ks +++ b/fedora-atomic.ks @@ -33,14 +33,14 @@ volgroup atomicos pv.01 logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos # Equivalent of %include fedora-repo.ks -ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/rawhide/ --ref=fedora-atomic/rawhide/x86_64/docker-host +ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/atomic/24/ --ref=fedora-atomic/24/x86_64/docker-host reboot %post --erroronfail # See https://github.com/projectatomic/rpm-ostree/issues/42 ostree remote delete fedora-atomic -ostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/rawhide/' +ostree remote add --set=gpg-verify=false fedora-atomic 'https://dl.fedoraproject.org/pub/fedora/linux/atomic/24/' # older versions of livecd-tools do not follow "rootpw --lock" line above # https://bugzilla.redhat.com/show_bug.cgi?id=964299