Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

overlay.d: add 40grub overlay #2769

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions manifests/fedora-coreos-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ ostree-layers:
- overlay/20platform-chrony
- overlay/25azure-udev-rules
- overlay/30lvmdevices
- overlay/40grub

# Be minimal
recommends: false
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

# Any non-default console settings will be inserted here.
# CONSOLE-SETTINGS-START
# CONSOLE-SETTINGS-END
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Remove soon when Ignition is providing this:
# https://github.com/coreos/fedora-coreos-config/pull/2769#discussion_r1428152480
#
# Determine if this is a first boot and set the ${ignition_firstboot} variable
# which is used in the kernel command line.
set ignition_firstboot=""
if [ -f "/ignition.firstboot" ]; then
# Default networking parameters to be used with ignition.
set ignition_network_kcmdline=''

# Source in the `ignition.firstboot` file which could override the
# above $ignition_network_kcmdline with static networking config.
# This override feature is also by coreos-installer to persist static
# networking config provided during install to the first boot of the machine.
source "/ignition.firstboot"

set ignition_firstboot="ignition.firstboot ${ignition_network_kcmdline}"
fi
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

# Import user defined configuration
# tracker: https://github.com/coreos/fedora-coreos-tracker/issues/805
if [ -f $prefix/user.cfg ]; then
source $prefix/user.cfg
fi
6 changes: 6 additions & 0 deletions overlay.d/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,3 +93,9 @@ pre-existing LVM devices attached. See the tracker issue [1] for more
information.

[1] https://github.com/coreos/fedora-coreos-tracker/issues/1517

40grub
------

Add in static grub configs that will be leveraged by bootupd when
managing bootloaders. See https://github.com/coreos/bootupd/pull/543