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.

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

Jump to bottom

Enable composefs #3009

Merged
merged 4 commits into from
Aug 30, 2024
Merged

Enable composefs #3009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1fa2771
Enable composefs for 41+
cgwalters Feb 15, 2024
5c31da0
denylist: add kdump.crash for rawhide
jbtrystram Jul 17, 2024
22af0ad
tests: adapt for composefs
jlebon Jul 18, 2024
3f3d65b
overlay/05core: disable composefs for the live ISO
jbtrystram Jul 18, 2024
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
7 changes: 7 additions & 0 deletions kola-denylist.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,10 @@
streams:
- rawhide
- branched
- pattern: ext.config.kdump.crash
tracker: https://bugzilla.redhat.com/show_bug.cgi?id=2284097
Copy link
Member

Choose a reason for hiding this comment

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

can you open an FCOS issue tracker ticket for this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

coreos/fedora-coreos-tracker#1791

snooze: 2024-09-01
warn: true
streams:
- rawhide
jbtrystram marked this conversation as resolved.
Show resolved Hide resolved
- branched
3 changes: 3 additions & 0 deletions manifests/composefs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Enable composefs by default.
ostree-layers:
- overlay/08composefs
2 changes: 2 additions & 0 deletions manifests/fedora-coreos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ conditional-include:
# Wifi firmwares will be dropped in F41
- if: releasever < 41
include: wifi-firmwares.yaml
- if: releasever >= 41
include: composefs.yaml

ostree-layers:
- overlay/15fcos
Expand Down
5 changes: 4 additions & 1 deletion overlay.d/05core/usr/lib/dracut/modules.d/35coreos-live/ostree-cmdline.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@ set -euo pipefail
case "${1:-unset}" in
start)
treepath="$(echo /sysroot/ostree/boot.1/*/*/0)"
echo "$(cat /proc/cmdline) ostree=${treepath#/sysroot}" > /tmp/cmdline
# ostree-prepare-root requires /etc and /var to be writeable for composeFS
# which cannot happen in the live ISO. Disable composeFS there
# https://github.com/coreos/fedora-coreos-config/pull/3009#issuecomment-2235923719
echo "$(cat /proc/cmdline) ostree=${treepath#/sysroot} ostree.prepare-root.composefs=0" > /tmp/cmdline
jbtrystram marked this conversation as resolved.
Show resolved Hide resolved
mount --bind /tmp/cmdline /proc/cmdline
;;
stop)
Expand Down
1 change: 1 addition & 0 deletions overlay.d/08composefs/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Enable composefs by default; more in https://ostreedev.github.io/ostree/composefs/
2 changes: 2 additions & 0 deletions overlay.d/08composefs/usr/lib/ostree/prepare-root.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[composefs]
enabled = true
2 changes: 1 addition & 1 deletion tests/kola/root-reprovision/autosave-xfs/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ fi
journalctl -u ignition-ostree-transposefs-autosave-xfs.service --grep=agcount
ok "autosaved XFS on large disk"

eval $(xfs_info / | grep -o 'agcount=[0-9]*')
eval $(xfs_info /sysroot | grep -o 'agcount=[0-9]*')
expected=4
if [ "$agcount" -gt "$expected" ]; then
fatal "expected agcount of at most ${expected}, got ${agcount}"
Expand Down
2 changes: 1 addition & 1 deletion tests/kola/root-reprovision/luks/autosave-xfs/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ if [ -z "${AUTOPKGTEST_REBOOT_MARK:-}" ]; then
fi
ok "autosaved XFS on large disk"

eval $(xfs_info / | grep -o 'agcount=[0-9]*')
eval $(xfs_info /sysroot | grep -o 'agcount=[0-9]*')
expected=4
if [ "$agcount" -gt "${expected}" ]; then
fatal "expected agcount of at most ${expected}, got ${agcount}"
Expand Down
4 changes: 2 additions & 2 deletions tests/kola/root-reprovision/raid1/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ set -xeuo pipefail
# shellcheck disable=SC1091
. "$KOLA_EXT_DATA/commonlib.sh"

srcdev=$(findmnt -nvr / -o SOURCE)
srcdev=$(findmnt -nvr /sysroot -o SOURCE)
[[ ${srcdev} == $(realpath /dev/md/foobar) ]]

blktype=$(lsblk -o TYPE "${srcdev}" --noheadings)
[[ ${blktype} == raid1 ]]

fstype=$(findmnt -nvr / -o FSTYPE)
fstype=$(findmnt -nvr /sysroot -o FSTYPE)
[[ ${fstype} == xfs ]]
ok "source is XFS on RAID1 device"

Expand Down
2 changes: 1 addition & 1 deletion tests/kola/secex/ensure/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ grep -q bootfs.roothash /proc/cmdline
mount /dev/disk/by-label/se /sysroot/se
[[ -f /sysroot/se/sdboot ]]

check_luks /
check_luks /sysroot
check_luks /boot
Loading