davidlt/fedora-kickstarts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

atomichost: Use prod ref, not /updates

Browse Source 
We need the same bits that live in the f25 branch now.

I also deleted the remote add/delete, since I think they're
no longer necessary.
This commit is contained in:
Colin Walters 2017-07-26 11:31:51 -04:00
parent 2565b003d4
commit d57f0a2e2d
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fedora-atomic.ks
View File

@ -30,18 +30,23 @@ part pv.01 --grow
volgroup atomicos pv.01 volgroup atomicos pv.01
logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos logvol / --size=3000 --fstype="xfs" --name=root --vgname=atomicos
# Equivalent of %include fedora-repo.ks # Equivalent of %include fedora-repo.ks; note this uses the Bodhi ref, which we reset below
ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/atomic/26/ --ref=fedora/26/x86_64/updates/atomic-host ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/atomic/26/ --ref=fedora/26/x86_64/updates/atomic-host
reboot reboot
%post --erroronfail %post --erroronfail
# See https://github.com/projectatomic/rpm-ostree/issues/42 # Set the origin to the "main ref", distinct from /updates/ which is where bodhi writes.
# we only need this for before f26 release where we are using a # We want consumers of this image to track the two week releases.
# temporary "dev" repo url above. We want to change the remote ostree admin set-origin --index 0 fedora-atomic https://kojipkgs.fedoraproject.org/atomic/26/ fedora/26/x86_64/atomic-host
# we use to match where the repo will live for the entirety of f26.
ostree remote delete fedora-atomic # Make sure the ref we're supposedly sitting on (according
ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-26-primary fedora-atomic 'https://kojipkgs.fedoraproject.org/atomic/26/' # to the updated origin) exists.
ostree refs fedora-atomic:fedora/26/x86_64/updates/atomic-host --create fedora-atomic:fedora/26/x86_64/atomic-host
# Remove the old ref so that the commit eventually gets
# cleaned up.
ostree refs fedora-atomic:fedora/26/x86_64/updates/atomic-host --delete
# older versions of livecd-tools do not follow "rootpw --lock" line above # older versions of livecd-tools do not follow "rootpw --lock" line above
# https://bugzilla.redhat.com/show_bug.cgi?id=964299 # https://bugzilla.redhat.com/show_bug.cgi?id=964299