8000 Move from `initramfs-args` in manifest to `dracut.conf.d` files by cgwalters · Pull Request #1828 · coreos/fedora-coreos-config · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Move from initramfs-args in manifest to dracut.conf.d files #1828

New issue

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

Sign up for GitHub

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

Merged
merged 1 commit into from
Jul 11, 2022
Merged

Move from initramfs-args in manifest to dracut.conf.d files #1828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
8000
Diff view
Diff view
12 changes: 0 additions & 12 deletions manifests/fedora-coreos-base.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,6 @@ ostree-layers:
- overlay/14NetworkManager-plugins
- overlay/20platform-chrony

initramfs-args:
- --no-hostonly
# We don't support root on NFS, so we don't need it in the initramfs. It also
# conflicts with /var mount support in ignition because NFS tries to mount stuff
# in /var/ and then ignition can't cleanly unmount it. For example:
# https://github.com/dracutdevs/dracut/blob/1856ae95c873a6fe855b3dccd0144f1a96b9e71c/modules.d/95nfs/nfs-start-rpc.sh#L7
# See also discussion in https://github.com/coreos/fedora-coreos-config/pull/60
- --omit=nfs
# Omit these since we don't use them
- --omit=lvm
- --omit=iscsi

# Be minimal
recommends: false

Expand Down
4 changes: 0 additions & 4 deletions manifests/ignition-and-ostree.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
# Include rpm-ostree + kernel + bootloader
include: bootable-rpm-ostree.yaml

initramfs-args:
# make it a hard error if Ignition can't be included
- --add=ignition

# Modern defaults we want
boot-location: modules
tmp-is-dir: true
Expand Down
2 changes: 2 additions & 0 deletions overlay.d/05core/usr/lib/dracut/dracut.conf.d/fcos-nohostonly.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Default rpm-ostree model is server-side generated initramfs
hostonly=no
7 changes: 7 additions & 0 deletions overlay.d/05core/usr/lib/dracut/dracut.conf.d/fcos-omits.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# We don't support root on NFS, so we don't need it in the initramfs. It also
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Worth noting these dropins are going to be inherited by RHCOS, while previously the manifest bits in fedora-coreos-base.yaml were FCOS-specific. We do want those for RHCOS too, but strangely enough it looks like in https://github.com/openshift/os/blob/01f98943688b5b61a9276127a1b7f06aafd0b42a/common.yaml#L32-L53 we're explicitly pulling in iscsi in RHCOS but explicitly omitting it here.

I think dracut will give priority to the cmdline arg in RHCOS, but worth digging into the history there. And of course we should delete that hunk in favour of dracut.conf.d there too.

# conflicts with /var mount support in ignition because NFS tries to mount stuff
# in /var/ and then ignition can't cleanly unmount it. For example:
# https://github.com/dracutdevs/dracut/blob/1856ae95c873a6fe855b3dccd0144f1a96b9e71c/modules.d/95nfs/nfs-start-rpc.sh#L7
# See also discussion in https://github.com/coreos/fedora-coreos-config/pull/60
# Further, we currently do not use LVM or iSCSI
omit_dracutmodules+=" nfs lvm iscsi "
0