[Fedora-spins] [spin-kickstarts/f21] cloud-atomic: Bring sanity to the remote setup

[Colin Walters]

commit f9306a033450b1b6638096a8956889178ab7ad8d
Author: Colin Walters <walters at verbum.org>
Date:   Mon Nov 17 15:55:35 2014 -0500

    cloud-atomic: Bring sanity to the remote setup
    
    We were doing gyrations here between the "installmedia" remote and the
    intended "fedora-atomic" remote.  Thinking about this, it's *far*
    simpler if we pretend installmedia is the target remote.
    
    We still need to delete the remote configuration Anaconda added and
    re-add it with the real target URL.

 fedora-cloud-atomic.ks |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index 1d1294c..30a4866 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -29,7 +29,7 @@ part pv.01 --grow
 volgroup atomicos pv.01
 logvol / --size=2000 --fstype="xfs" --name=root --vgname=atomicos
 
-ostreesetup --nogpg --osname=fedora-atomic-host --remote=installmedia --url=http://compose-x86-02.phx2.fedoraproject.org/compose/atomic/ --ref=fedora-atomic/f21/x86_64/docker-host
+ostreesetup --nogpg --osname=fedora-atomic-host --remote=fedora-atomic --url=http://compose-x86-02.phx2.fedoraproject.org/compose/atomic/ --ref=fedora-atomic/f21/x86_64/docker-host
 
 reboot
 
@@ -37,9 +37,8 @@ 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 'http://dl.fedoraproject.org/pub/fedora/linux/atomic/21/'
-(origin_file=$(echo -n /ostree/deploy/fedora-atomic-host/deploy/*.origin); sed -e 's,installmedia:,fedora-atomic:,' < ${origin_file} > ${origin_file}.new && mv ${origin_file}{.new,})
-rm /ostree/repo/refs/remotes/installmedia -rf
 
 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299