bingshuo/hololake-system-architecture
Watch
1
0
Fork
You've already forked hololake-system-architecture
 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

fix(guanghu-os): bound BusyBox repository readback

Browse source
This commit is contained in:
冰朔 2026-08-16 00:46:17 +08:00
commit 27286d54f5
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
product-source/hololake-platform/guanghu-os/scripts/build-guanghu-cross-root-fixture.sh
View file

@ -35,7 +35,7 @@ mkdir -p "${staging}/bin" "${staging}/sbin" "${staging}/usr/lib/guanghu" \
"${staging}/usr/share/guanghu/repository-service-equivalence" \ "${staging}/usr/share/guanghu/repository-service-equivalence" \
"$(dirname "${output}")" "$(dirname "${output}")"
install -m 0755 /bin/busybox "${staging}/bin/busybox" install -m 0755 /bin/busybox "${staging}/bin/busybox"
for applet in sh sleep cat grep tr stat mkdir mv chmod readlink kill sync poweroff sed id httpd wget rm ip; do for applet in sh sleep cat grep tr stat mkdir mv chmod readlink kill sync poweroff sed id httpd wget rm ip timeout; do
ln -s busybox "${staging}/bin/${applet}" ln -s busybox "${staging}/bin/${applet}"
done done
install -m 0755 "${supervisor}" "${staging}/usr/lib/guanghu/guanghu-root-supervisor" install -m 0755 "${supervisor}" "${staging}/usr/lib/guanghu/guanghu-root-supervisor"
@ -68,7 +68,7 @@ if [ -x /usr/lib/guanghu/guanghu-repository-bridge-lifecycle ]; then
/usr/lib/guanghu/guanghu-repository-bridge-lifecycle run REQ-QEMU-CROSS-ROOT-001 /usr/lib/guanghu/guanghu-repository-bridge-lifecycle run REQ-QEMU-CROSS-ROOT-001
grep -Fq '"result":"PASS_100"' /guanghu/receipts/repository-bridge-lifecycle/REQ-QEMU-CROSS-ROOT-001.json grep -Fq '"result":"PASS_100"' /guanghu/receipts/repository-bridge-lifecycle/REQ-QEMU-CROSS-ROOT-001.json
grep -Fq '"final_state":"DORMANT"' /guanghu/receipts/repository-bridge-lifecycle/REQ-QEMU-CROSS-ROOT-001.json grep -Fq '"final_state":"DORMANT"' /guanghu/receipts/repository-bridge-lifecycle/REQ-QEMU-CROSS-ROOT-001.json
if wget -q -T 1 -O /dev/null http://127.0.0.1:39301/main; then if timeout 1 wget -q -O /dev/null http://127.0.0.1:39301/main; then
echo 'GUANGHU_CROSS_ROOT_REPOSITORY_SERVICE_FAIL_0: repository service remained ready after reclaim' >&2 echo 'GUANGHU_CROSS_ROOT_REPOSITORY_SERVICE_FAIL_0: repository service remained ready after reclaim' >&2
poweroff -f poweroff -f
while :; do sleep 30; done while :; do sleep 30; done

6
product-source/hololake-platform/guanghu-os/scripts/qemu-repository-service-equivalence-backend.sh
View file

@ -35,7 +35,7 @@ process_alive() {
} }
observe() { observe() {
if process_alive && wget -q -T 1 -O /dev/null "${url}"; then if process_alive && timeout 1 wget -q -O /dev/null "${url}"; then
echo ready echo ready
else else
echo dormant echo dormant
@ -62,11 +62,11 @@ case "${1:-}" in
;; ;;
execute) execute)
[ "$(observe)" = ready ] || die "service is not ready" [ "$(observe)" = ready ] || die "service is not ready"
wget -q -T 2 -O "${readback_file}" "${url}" timeout 2 wget -q -O "${readback_file}" "${url}"
;; ;;
verify) verify)
[ "$(cat "${readback_file}")" = "$(cat "${expected_file}")" ] || die "repository main readback mismatch" [ "$(cat "${readback_file}")" = "$(cat "${expected_file}")" ] || die "repository main readback mismatch"
[ "$(wget -q -T 2 -O - "${url}")" = "$(cat "${expected_file}")" ] || die "live repository main mismatch" [ "$(timeout 2 wget -q -O - "${url}")" = "$(cat "${expected_file}")" ] || die "live repository main mismatch"
;; ;;
reclaim) reclaim)
if process_alive; then if process_alive; then

4
product-source/hololake-platform/guanghu-os/scripts/test-cross-root-repository-service-equivalence.sh
View file

@ -11,6 +11,10 @@ sh -n "${controller}"
grep -Fq 'httpd -f -p 127.0.0.1:39301' "${backend}" grep -Fq 'httpd -f -p 127.0.0.1:39301' "${backend}"
grep -Fq 'repository-main-readback' "${backend}" grep -Fq 'repository-main-readback' "${backend}"
grep -Fq 'service reclaim failed' "${backend}" grep -Fq 'service reclaim failed' "${backend}"
if grep -Fq 'wget -q -T' "${backend}" "${builder}"; then
echo 'BusyBox wget does not support -T in the JD initramfs baseline' >&2
exit 1
fi
grep -Fq 'ip link set lo up' "${builder}" grep -Fq 'ip link set lo up' "${builder}"
grep -Fq 'GUANGHU_CROSS_ROOT_REPOSITORY_SERVICE_EQUIVALENCE_VERIFIED' "${builder}" grep -Fq 'GUANGHU_CROSS_ROOT_REPOSITORY_SERVICE_EQUIVALENCE_VERIFIED' "${builder}"
grep -Fq 'REQ-QEMU-CROSS-ROOT-001' "${builder}" grep -Fq 'REQ-QEMU-CROSS-ROOT-001' "${builder}"