Skip to content

Commit

Permalink
Move from initramfs-args in manifest to dracut.conf.d files
Browse files Browse the repository at this point in the history
See coreos/rpm-ostree#3799

This way when we run dracut in a container build, we naturally
pick up the same config we used for server side builds.
  • Loading branch information
cgwalters committed Jul 11, 2022
1 parent 8772f97 commit 9997df7
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 16 deletions.
12 changes: 0 additions & 12 deletions manifests/fedora-coreos-base.yaml
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
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
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
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
# 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 comments on commit 9997df7

Please sign in to comment.