ps5-linux/ps5-linux-image
1
0
Fork 0
mirror of https://github.com/ps5-linux/ps5-linux-image.git synced 2026-07-16 01:50:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: export CHROOT/DISTRO/KVER to build-rootfs.sh + sanity guard (#21)

Browse Source 
The dispatch in #20 ran build-rootfs.sh without exporting $CHROOT, so
inside the script it was empty — meaning '/' expansions like
`mv "$UNPACK/rootfs"/* "$CHROOT/"` resolved to '/' and the bazzite
rootfs went into the build container's root. Container-contained, but
the build failed with a confusing 'Device or resource busy' on
/etc/resolv.conf.

Two fixes:
- entrypoint exports DISTRO/CHROOT/KVER/ROOT_LABEL/EFI_LABEL when
  calling the per-distro script, and asserts $CHROOT non-empty.
- bazzite + batocera scripts have a top-of-file guard that bails if
  $CHROOT is unset, missing, or '/'.

Co-authored-by: mia26MAjFm <mia26MAjFm@users.noreply.github.com>
This commit is contained in:
mia26MAjFm
2026-06-20 12:43:53 -04:00
committed by GitHub
parent f090f170a0
commit e1f17f7e38
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
distros/batocera/build-rootfs.sh
View File

@@ -13,6 +13,10 @@
set -ex set -ex
: "${CHROOT:?ERROR: \$CHROOT unset/empty}"
[ -d "$CHROOT" ] || { echo "ERROR: \$CHROOT=$CHROOT not a directory"; exit 2; }
case "$CHROOT" in /) echo "ERROR: refuse to operate on /"; exit 2 ;; esac
# Batocera is a Buildroot-based emulation distro. It ships as a # Batocera is a Buildroot-based emulation distro. It ships as a
# single .img.gz with FAT32 boot + ext4 SHARE partitions; the OS # single .img.gz with FAT32 boot + ext4 SHARE partitions; the OS
# itself lives in a squashfs file (`/boot/batocera`) on the FAT32. # itself lives in a squashfs file (`/boot/batocera`) on the FAT32.

4
distros/bazzite/build-rootfs.sh
View File

@@ -11,6 +11,10 @@
set -ex set -ex
: "${CHROOT:?ERROR: \$CHROOT unset/empty}"
[ -d "$CHROOT" ] || { echo "ERROR: \$CHROOT=$CHROOT not a directory"; exit 2; }
case "$CHROOT" in /) echo "ERROR: refuse to operate on /"; exit 2 ;; esac
# Bazzite is an OCI atomic image; bypass distrobuilder entirely. # Bazzite is an OCI atomic image; bypass distrobuilder entirely.
# DISTRO=bazzite -> ghcr.io/ublue-os/bazzite:stable # DISTRO=bazzite -> ghcr.io/ublue-os/bazzite:stable
# DISTRO=bazzite-deck -> ghcr.io/ublue-os/bazzite-deck:stable # DISTRO=bazzite-deck -> ghcr.io/ublue-os/bazzite-deck:stable

6
docker/image-builder/entrypoint.sh
View File

@@ -32,8 +32,12 @@ elif [ -x "/repo/distros/${DISTRO}/build-rootfs.sh" ]; then
# bypassed entirely. Most often used for OCI atomic images (bazzite via # bypassed entirely. Most often used for OCI atomic images (bazzite via
# skopeo+umoci) or pre-built rootfs images (batocera squashfs). # skopeo+umoci) or pre-built rootfs images (batocera squashfs).
echo "=== Building $DISTRO rootfs via distros/${DISTRO}/build-rootfs.sh ===" echo "=== Building $DISTRO rootfs via distros/${DISTRO}/build-rootfs.sh ==="
[ -n "$CHROOT" ] || { echo "FATAL: \$CHROOT empty"; exit 1; }
mkdir -p "$CHROOT"
rm -rf "$CHROOT"/* "$CHROOT"/.[!.]* 2>/dev/null || true rm -rf "$CHROOT"/* "$CHROOT"/.[!.]* 2>/dev/null || true
bash "/repo/distros/${DISTRO}/build-rootfs.sh" DISTRO="$DISTRO" CHROOT="$CHROOT" KVER="$KVER" \
ROOT_LABEL="$ROOT_LABEL" EFI_LABEL="$EFI_LABEL" \
bash "/repo/distros/${DISTRO}/build-rootfs.sh"
else else
echo "=== Building $DISTRO rootfs ===" echo "=== Building $DISTRO rootfs ==="
# --- Stage files for distrobuilder's copy generators --- # --- Stage files for distrobuilder's copy generators ---