kylekrein/live-bootstrap
1
0
Fork 0
mirror of https://github.com/fosslinux/live-bootstrap.git synced 2026-03-24 12:06:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(payload-discovery): mount proc and probe devices from /proc/partitions with magic-based selection

Browse source
This commit is contained in:
vxtls 2026-03-01 22:08:37 -05:00
parent 5eac7edb91
commit 17e88a89a8
1 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
steps/improve/import_payload.sh
View file

@ -7,21 +7,28 @@ set -ex
if [ "${PAYLOAD_REQUIRED}" = True ]; then if [ "${PAYLOAD_REQUIRED}" = True ]; then
mkdir -p /external/distfiles mkdir -p /external/distfiles
found_payload=0 mkdir -p /proc
mount -t proc proc /proc >/dev/null 2>&1 || :
# Probe all block devices reported by the running kernel instead of if [ ! -r /proc/partitions ]; then
# assuming fixed names like /dev/sdb or /dev/hdb. echo "payload-import failed: /proc/partitions is unavailable." >&2
exit 1
fi
found_payload=0
while read -r major minor blocks name; do while read -r major minor blocks name; do
case "${name}" in case "${name}" in
""|name|ram*|loop*|fd*|sr*|md*) ""|name|ram*|loop*|fd*|sr*|md*|dm-*|nbd*)
continue
;;
*[0-9])
# Skip partitions (sda1, vdb2, ...); payload is attached as a whole disk.
continue continue
;; ;;
esac esac
dev_path="/dev/${name}" dev_path="/dev/${name}"
if [ ! -b "${dev_path}" ]; then mknod -m 600 "${dev_path}" b "${major}" "${minor}" >/dev/null 2>&1 || :
mknod -m 600 "${dev_path}" b "${major}" "${minor}" || :
fi
if payload-import --probe "${dev_path}"; then if payload-import --probe "${dev_path}"; then
payload-import --device "${dev_path}" /external/distfiles payload-import --device "${dev_path}" /external/distfiles
@ -31,7 +38,7 @@ if [ "${PAYLOAD_REQUIRED}" = True ]; then
done < /proc/partitions done < /proc/partitions
if [ "${found_payload}" != 1 ]; then if [ "${found_payload}" != 1 ]; then
echo "payload-import failed: no payload image found on detected block devices." >&2 echo "payload-import failed: no payload image found on probed block devices." >&2
exit 1 exit 1
fi fi
fi fi