mirror of
https://pagure.io/fedora-kickstarts.git
synced 2024-11-22 07:23:09 +00:00
Update ostree repo url from atomic/repo/ to ostree/repo
Also update ostree remote url and set metalink=mirrolist Related - https://pagure.io/fedora-infrastructure/issue7487 Signed-off-by: Sinny Kumari <sinny@redhat.com>
This commit is contained in:
parent
776ba2064e
commit
43a6635b8b
@ -2,14 +2,14 @@
|
||||
# ./fedora-atomic-testing-base.ks - for building media from the testing
|
||||
# refs (fedora/29/${basearch}/testing/atomic-host)
|
||||
|
||||
ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/atomic/repo/ --ref=fedora/29/${basearch}/testing/atomic-host
|
||||
ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/ostree/repo/ --ref=fedora/29/${basearch}/testing/atomic-host
|
||||
|
||||
%post --erroronfail
|
||||
# Find the architecture we are on
|
||||
arch=$(uname -m)
|
||||
# Set the origin to the "main stable ref", distinct from /testing/ which is where bodhi writes.
|
||||
# We want consumers of this image to track the two week releases.
|
||||
ostree admin set-origin --index 0 fedora-atomic https://dl.fedoraproject.org/atomic/repo/ "fedora/29/${arch}/atomic-host"
|
||||
ostree admin set-origin --index 0 fedora-atomic https://ostree.fedoraproject.org "fedora/29/${arch}/atomic-host"
|
||||
|
||||
# Make sure the ref we're supposedly sitting on (according
|
||||
# to the updated origin) exists.
|
||||
@ -22,6 +22,6 @@ ostree refs "fedora-atomic:fedora/29/${arch}/testing/atomic-host" --delete
|
||||
# delete/add the remote with new options to enable gpg verification
|
||||
# and to point them at the cdn url
|
||||
ostree remote delete fedora-atomic
|
||||
ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-29-primary fedora-atomic 'https://dl.fedoraproject.org/atomic/repo/'
|
||||
ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-29-primary --set=contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist fedora-atomic 'https://ostree.fedoraproject.org'
|
||||
|
||||
%end
|
||||
|
@ -2,14 +2,14 @@
|
||||
# ./fedora-atomic-updates-base.ks - for building media from the updates
|
||||
# refs (fedora/29/${basearch}/updates/atomic-host)
|
||||
|
||||
ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/atomic/repo/ --ref=fedora/29/${basearch}/updates/atomic-host
|
||||
ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/ostree/repo/ --ref=fedora/29/${basearch}/updates/atomic-host
|
||||
|
||||
%post --erroronfail
|
||||
# Find the architecture we are on
|
||||
arch=$(uname -m)
|
||||
# Set the origin to the "main stable ref", distinct from /updates/ which is where bodhi writes.
|
||||
# We want consumers of this image to track the two week releases.
|
||||
ostree admin set-origin --index 0 fedora-atomic https://dl.fedoraproject.org/atomic/repo/ "fedora/29/${arch}/atomic-host"
|
||||
ostree admin set-origin --index 0 fedora-atomic https://ostree.fedoraproject.org "fedora/29/${arch}/atomic-host"
|
||||
|
||||
# Make sure the ref we're supposedly sitting on (according
|
||||
# to the updated origin) exists.
|
||||
@ -22,6 +22,6 @@ ostree refs "fedora-atomic:fedora/29/${arch}/updates/atomic-host" --delete
|
||||
# delete/add the remote with new options to enable gpg verification
|
||||
# and to point them at the cdn url
|
||||
ostree remote delete fedora-atomic
|
||||
ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-29-primary fedora-atomic 'https://dl.fedoraproject.org/atomic/repo/'
|
||||
ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-29-primary --set=contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist fedora-atomic 'https://ostree.fedoraproject.org'
|
||||
|
||||
%end
|
||||
|
@ -58,7 +58,7 @@ logvol / --size=3000 --grow --fstype="xfs" --name=root --vgname=atomicos
|
||||
|
||||
# Equivalent of %include fedora-repo.ks
|
||||
# Pull from the ostree repo that was created during the compose
|
||||
ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/atomic/repo/ --ref=fedora/29/${basearch}/atomic-host
|
||||
ostreesetup --nogpg --osname=fedora-atomic --remote=fedora-atomic --url=https://kojipkgs.fedoraproject.org/compose/ostree/repo/ --ref=fedora/29/${basearch}/atomic-host
|
||||
|
||||
reboot
|
||||
|
||||
@ -68,7 +68,7 @@ reboot
|
||||
# This location is where the compose gets synced to after the compose
|
||||
# is done.
|
||||
ostree remote delete fedora-atomic
|
||||
ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-29-primary fedora-atomic 'https://kojipkgs.fedoraproject.org/atomic/repo/'
|
||||
ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-29-primary --set=contenturl=mirrorlist=https://ostree.fedoraproject.org/mirrorlist fedora-atomic 'https://ostree.fedoraproject.org'
|
||||
|
||||
# older versions of livecd-tools do not follow "rootpw --lock" line above
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=964299
|
||||
|
Loading…
Reference in New Issue
Block a user