containers/bootc
1
0
Fork 0
mirror of https://github.com/containers/bootc.git synced 2026-02-05 06:45:13 +01:00
Code Issues Activity

test/tmt: Use bootc usroverlay for /usr overlay mount (#1882)

Browse Source 
Previously we were mounting a rw overlay on top of /usr using
`mount -t overlay -olowerdir=/usr,workdir=...,upperdir=... overlay /usr`
which caused the kernel to throw
`overlayfs: maximum fs stacking depth exceeded`
possibly because the mountpoint was the same as the lowerdir

Also, move the overlay mount BEFORE we mask off `/sysroot/ostree` else
bootc throws `error: Read only filesystem`

Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
This commit is contained in:
Pragyan Poudyal
2025-12-29 13:29:47 +05:30
committed by GitHub
parent 0aae35a434
commit 0e2ad92675
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tmt/tests/booted/test-install-outside-container.nu
View File

@@ -30,9 +30,8 @@ umount /var/mnt
setenforce 0 setenforce 0
systemd-run -p MountFlags=slave -qdPG -- /bin/sh -c $" systemd-run -p MountFlags=slave -qdPG -- /bin/sh -c $"
set -xeuo pipefail set -xeuo pipefail
bootc usr-overlay
if test -d /sysroot/ostree; then mount --bind /usr/share/empty /sysroot/ostree; fi if test -d /sysroot/ostree; then mount --bind /usr/share/empty /sysroot/ostree; fi
mkdir -p /tmp/ovl/{upper,work}
mount -t overlay -olowerdir=/usr,workdir=/tmp/ovl/work,upperdir=/tmp/ovl/upper overlay /usr
# Note we do keep the other bootupd state # Note we do keep the other bootupd state
rm -vrf /usr/lib/bootupd/updates rm -vrf /usr/lib/bootupd/updates
# Another bootc install bug, we should not look at this in outside-of-container flows # Another bootc install bug, we should not look at this in outside-of-container flows

3
tmt/tests/booted/test-install-unified-flag.nu
View File

@@ -29,9 +29,8 @@ def main [] {
# We use systemd-run to handle mount namespace issues # We use systemd-run to handle mount namespace issues
systemd-run -p MountFlags=slave -qdPG -- /bin/sh -c $" systemd-run -p MountFlags=slave -qdPG -- /bin/sh -c $"
set -xeuo pipefail set -xeuo pipefail
bootc usr-overlay
if test -d /sysroot/ostree; then mount --bind /usr/share/empty /sysroot/ostree; fi if test -d /sysroot/ostree; then mount --bind /usr/share/empty /sysroot/ostree; fi
mkdir -p /tmp/ovl/{upper,work}
mount -t overlay -olowerdir=/usr,workdir=/tmp/ovl/work,upperdir=/tmp/ovl/upper overlay /usr
# Note we do keep the other bootupd state # Note we do keep the other bootupd state
rm -vrf /usr/lib/bootupd/updates rm -vrf /usr/lib/bootupd/updates
# Another bootc install bug, we should not look at this in outside-of-container flows # Another bootc install bug, we should not look at this in outside-of-container flows