From 1fac51f92ebb065c45266f650c4873763b3ff966 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 2 Sep 2015 17:12:19 -0400 Subject: [PATCH] atomic: Fix references for branched --- atomic-installer/lorax-configure-repo.tmpl | 2 +- fedora-cloud-atomic-pxetolive.ks | 2 +- fedora-cloud-atomic.ks | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/atomic-installer/lorax-configure-repo.tmpl b/atomic-installer/lorax-configure-repo.tmpl index d9f9803..73c6a33 100644 --- a/atomic-installer/lorax-configure-repo.tmpl +++ b/atomic-installer/lorax-configure-repo.tmpl @@ -4,5 +4,5 @@ <%page args="ostree_osname, ostree_ref"/> append usr/share/anaconda/interactive-defaults.ks "ostreesetup --nogpg --osname=${ostree_osname} --remote=${ostree_osname} --url=file:////run/install/repo/content/repo --ref=${ostree_ref}\n" append usr/share/anaconda/interactive-defaults.ks "services --disabled cloud-init,cloud-config,cloud-final,cloud-init-local\n" -append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail\nrm -f /etc/ostree/remotes.d/${ostree_osname}.conf\nostree remote add --set=gpg-verify=false fedora-atomic 'http://dl.fedoraproject.org/pub/fedora/linux/atomic/22/'\n%end\n" +append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail\nrm -f /etc/ostree/remotes.d/${ostree_osname}.conf\nostree remote add --set=gpg-verify=false fedora-atomic 'http://dl.fedoraproject.org/pub/fedora/linux/atomic/23/'\n%end\n" diff --git a/fedora-cloud-atomic-pxetolive.ks b/fedora-cloud-atomic-pxetolive.ks index 4c67673..a1fea8b 100644 --- a/fedora-cloud-atomic-pxetolive.ks +++ b/fedora-cloud-atomic-pxetolive.ks @@ -17,7 +17,7 @@ shutdown services --disabled=docker-storage-setup,network services --enabled=NetworkManager,sshd,cloud-init,cloud-init-local,cloud-config,cloud-final -ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/22/ --ref=fedora-atomic/f22/x86_64/docker-host +ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=http://kojipkgs.fedoraproject.org/mash/atomic/23/ --ref=fedora-atomic/f23/x86_64/docker-host %post diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks index a897320..d33f316 100644 --- a/fedora-cloud-atomic.ks +++ b/fedora-cloud-atomic.ks @@ -33,7 +33,7 @@ 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=http://kojipkgs.fedoraproject.org/mash/atomic/23/ --ref=fedora-atomic/f23/x86_64/docker-host reboot