Skip to content

Commit

Permalink
tree: promote changes from testing-devel at 1206a4f
Browse files Browse the repository at this point in the history
  • Loading branch information
dustymabe committed Apr 8, 2020
1 parent a06f0a3 commit 7b1cdf3
Show file tree
Hide file tree
Showing 13 changed files with 694 additions and 95 deletions.
2 changes: 1 addition & 1 deletion live/EFI/fedora/grub.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@ set timeout=5

### BEGIN /etc/grub.d/10_linux ###
menuentry 'Fedora CoreOS (Live)' --class fedora --class gnu-linux --class gnu --class os {
linux /images/vmlinuz @@KERNEL-ARGS@@ rd.neednet=1 ip=dhcp ignition.firstboot ignition.platform.id=metal
linux /images/vmlinuz @@KERNEL-ARGS@@ ignition.firstboot ignition.platform.id=metal
initrd /images/initramfs.img
}
2 changes: 1 addition & 1 deletion live/isolinux/isolinux.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ label linux
menu label ^Fedora CoreOS (Live)
menu default
kernel /images/vmlinuz
append initrd=/images/initramfs.img @@KERNEL-ARGS@@ rd.neednet=1 ip=dhcp ignition.firstboot ignition.platform.id=metal
append initrd=/images/initramfs.img @@KERNEL-ARGS@@ ignition.firstboot ignition.platform.id=metal

menu separator # insert an empty line

Expand Down
2 changes: 1 addition & 1 deletion live/zipl.prm
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@@KERNEL-ARGS@@ rd.neednet=1 ip=dhcp ignition.firstboot ignition.platform.id=metal
@@KERNEL-ARGS@@ ignition.firstboot ignition.platform.id=metal
26 changes: 14 additions & 12 deletions manifest-lock.overrides.x86_64.yaml
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
packages:
# Fast-tracking to get exoscale support working
# https://bodhi.fedoraproject.org/updates/FEDORA-2020-3b08fdffe8
afterburn:
evra: 4.3.2-1.fc31.x86_64
afterburn-dracut:
evra: 4.3.2-1.fc31.x86_64
# crypto-policies without python dependencies
# We're pulling from f32 here as this is a brand new change
# and the maintainer is not comfortable sending it to F31 yet.
# https://src.fedoraproject.org/rpms/crypto-policies/pull-request/6#comment-35958
crypto-policies:
evra: 20191128-5.gitcd267a5.fc32.noarch
# New release of podman with fix for https://github.com/containers/libpod/issues/5306
# https://bodhi.fedoraproject.org/updates/FEDORA-2020-fc91673e24
podman:
evra: 2:1.8.1-2.fc31.x86_64
podman-plugins:
evra: 2:1.8.1-2.fc31.x86_64
# Cherry-pick new {rpm-,}ostree to resolve issues with /read-only sysroot
# https://bodhi.fedoraproject.org/updates/FEDORA-2020-d920214f63
# Cherry-pick rpm-ostree git snapshot to resolve issues with /read-only
# sysroot. We can nuke this when we cut a new release.
# https://github.com/coreos/fedora-coreos-tracker/issues/343
ostree:
evra: 2020.3-2.fc31.x86_64
ostree-libs:
evra: 2020.3-2.fc31.x86_64
rpm-ostree:
evra: 2020.1.21.ge9011530-2.fc31.x86_64
rpm-ostree-libs:
Expand All @@ -30,3 +26,9 @@ packages:
# https://bodhi.fedoraproject.org/updates/FEDORA-2020-6877a1f53d
zincati:
evra: 0.0.9-1.fc31.x86_64
# Fast track new coreos-installer for additional testing
# https://bodhi.fedoraproject.org/updates/FEDORA-2020-9b60fbda9e
coreos-installer:
evra: 0.1.3-1.fc31.x86_64
coreos-installer-systemd:
evra: 0.1.3-1.fc31.x86_64
Loading

0 comments on commit 7b1cdf3

Please sign in to comment.