Merge branch 'fix-initramfs-deprecation' into 'main'

Stop using deprecated initramfs-args

See merge request cgwalters-playground/bootc-demo-base-images!8
This commit is contained in:
Colin Walters 2023-09-08 19:34:19 +00:00
commit d055946bdf
No known key found for this signature in database
3 changed files with 15 additions and 5 deletions

14
oscore/initramfs.yaml Normal file
View file

@ -0,0 +1,14 @@
# Configuration for the initramfs
postprocess:
- |
#!/usr/bin/env bash
mkdir -p /usr/lib/dracut/dracut.conf.d
cat > /usr/lib/dracut/dracut.conf.d/01-bootc-nohostonly.conf
# We want a generic image; hostonly makes no sense as part of a server side build
hostonly=no
EOF
cat > /usr/lib/dracut/dracut.conf.d/49-tpm2-tss.conf << 'EOF'
# We want this for systemd-cryptsetup tpm2 locking
dracutmodules+=" tpm2-tss "
EOF

View file

@ -27,6 +27,7 @@ check-groups:
include:
- bootc.yaml
- initramfs.yaml
- bootable-rpm-ostree.yaml
- networking-tools.yaml
- system-configuration.yaml

View file

@ -1,10 +1,5 @@
# These are packages that are related to configuring parts of the system.
initramfs-args:
- "--no-hostonly"
- "--add"
- "tpm2-tss" # We want this for systemd-cryptsetup tpm2 locking
packages:
# Configuring SSH keys, cloud provider check-in, etc
# TODO: needs Ignition kargs