IoT: Update F-30 for stable ostree branch
Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
This commit is contained in:
parent
fd6025e168
commit
fae67ed384
@ -24,7 +24,7 @@ autopart --nohome --noswap --type=plain
|
|||||||
|
|
||||||
# Equivalent of %include fedora-repo.ks
|
# Equivalent of %include fedora-repo.ks
|
||||||
# Pull from the ostree repo that was created during the compose
|
# Pull from the ostree repo that was created during the compose
|
||||||
ostreesetup --nogpg --osname=fedora-iot --remote=fedora-iot --url=https://kojipkgs.fedoraproject.org/compose/iot/repo/ --ref=fedora/devel/${basearch}/iot
|
ostreesetup --nogpg --osname=fedora-iot --remote=fedora-iot --url=https://kojipkgs.fedoraproject.org/compose/iot/repo/ --ref=fedora/stable/${basearch}/iot
|
||||||
|
|
||||||
reboot
|
reboot
|
||||||
|
|
||||||
@ -44,19 +44,19 @@ fi
|
|||||||
|
|
||||||
# Set the origin to the "main ref", distinct from /updates/ which is where bodhi writes.
|
# Set the origin to the "main ref", distinct from /updates/ which is where bodhi writes.
|
||||||
# We want consumers of this image to track the two week releases.
|
# We want consumers of this image to track the two week releases.
|
||||||
ostree admin set-origin --index 0 fedora-iot https://dl.fedoraproject.org/iot/repo/ "fedora/devel/${arch}/iot"
|
ostree admin set-origin --index 0 fedora-iot https://dl.fedoraproject.org/iot/repo/ "fedora/stable/${arch}/iot"
|
||||||
|
|
||||||
# Make sure the ref we're supposedly sitting on (according
|
# Make sure the ref we're supposedly sitting on (according
|
||||||
# to the updated origin) exists.
|
# to the updated origin) exists.
|
||||||
ostree refs "fedora-iot:fedora/devel/${arch}/iot" --create "fedora-iot:fedora/devel/${arch}/iot"
|
ostree refs "fedora-iot:fedora/stable/${arch}/iot" --create "fedora-iot:fedora/stable/${arch}/iot"
|
||||||
|
|
||||||
# Remove the old ref so that the commit eventually gets cleaned up.
|
# Remove the old ref so that the commit eventually gets cleaned up.
|
||||||
ostree refs "fedora-iot:fedora/devel/${arch}/iot" --delete
|
ostree refs "fedora-iot:fedora/stable/${arch}/iot" --delete
|
||||||
|
|
||||||
# delete/add the remote with new options to enable gpg verification
|
# delete/add the remote with new options to enable gpg verification
|
||||||
# and to point them at the cdn url
|
# and to point them at the cdn url
|
||||||
ostree remote delete fedora-iot
|
ostree remote delete fedora-iot
|
||||||
ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-iot-2019 --set=contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist fedora-iot 'https://ostree.fedoraproject.org/iot'
|
ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/ --set=contenturl=mirrorlist=https://ostree.fedoraproject.org/iot/mirrorlist fedora-iot 'https://ostree.fedoraproject.org/iot'
|
||||||
|
|
||||||
# We're gettin a stray console= from somewhere, work around it
|
# We're gettin a stray console= from somewhere, work around it
|
||||||
rpm-ostree kargs --delete=console=tty0
|
rpm-ostree kargs --delete=console=tty0
|
||||||
|
Loading…
Reference in New Issue
Block a user