bstein/lesavka
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(installer): require explicit attached gadget rebuilds

Browse Source
This commit is contained in:
Brad Stein 2026-04-30 16:13:42 -03:00
parent 3f6447ab88
commit d4a8b78eca
6 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.lock generated
View File

@ -1652,7 +1652,7 @@ checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
[[package]] [[package]]
name = "lesavka_client" name = "lesavka_client"
version = "0.16.6" version = "0.16.7"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-stream", "async-stream",
@ -1686,7 +1686,7 @@ dependencies = [
[[package]] [[package]]
name = "lesavka_common" name = "lesavka_common"
version = "0.16.6" version = "0.16.7"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"base64", "base64",
@ -1698,7 +1698,7 @@ dependencies = [
[[package]] [[package]]
name = "lesavka_server" name = "lesavka_server"
version = "0.16.6" version = "0.16.7"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"base64", "base64",

2
client/Cargo.toml
View File

@ -4,7 +4,7 @@ path = "src/main.rs"
[package] [package]
name = "lesavka_client" name = "lesavka_client"
version = "0.16.6" version = "0.16.7"
edition = "2024" edition = "2024"
[dependencies] [dependencies]

2
common/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "lesavka_common" name = "lesavka_common"
version = "0.16.6" version = "0.16.7"
edition = "2024" edition = "2024"
build = "build.rs" build = "build.rs"

7
scripts/install/server.sh
View File

@ -1040,6 +1040,7 @@ sudo systemctl enable lesavka-core lesavka-server
UDC_STATE=$(udc_state) UDC_STATE=$(udc_state)
FORCE_GADGET_REBUILD=0 FORCE_GADGET_REBUILD=0
GADGET_REBUILD_REASON="" GADGET_REBUILD_REASON=""
EXPLICIT_GADGET_REBUILD=0
if [[ -z ${LESAVKA_DISABLE_UVC:-} ]] && ! uvc_gadget_present; then if [[ -z ${LESAVKA_DISABLE_UVC:-} ]] && ! uvc_gadget_present; then
FORCE_GADGET_REBUILD=1 FORCE_GADGET_REBUILD=1
GADGET_REBUILD_REASON="UVC function is missing from the live gadget" GADGET_REBUILD_REASON="UVC function is missing from the live gadget"
@ -1052,11 +1053,13 @@ if [[ "$UVC_ENV_CHANGED" == "1" ]] && is_attached_state "$UDC_STATE"; then
fi fi
if [[ -n ${LESAVKA_FORCE_GADGET_REBUILD:-} ]]; then if [[ -n ${LESAVKA_FORCE_GADGET_REBUILD:-} ]]; then
FORCE_GADGET_REBUILD=1 FORCE_GADGET_REBUILD=1
EXPLICIT_GADGET_REBUILD=1
GADGET_REBUILD_REASON="explicit LESAVKA_FORCE_GADGET_REBUILD request" GADGET_REBUILD_REASON="explicit LESAVKA_FORCE_GADGET_REBUILD request"
echo "⚠️ explicit LESAVKA_FORCE_GADGET_REBUILD request; forcing a gadget rebuild before server start." echo "⚠️ explicit LESAVKA_FORCE_GADGET_REBUILD request; forcing a gadget rebuild before server start."
fi fi
if [[ "$FORCE_GADGET_REBUILD" == "1" && -z ${LESAVKA_ALLOW_GADGET_RESET:-} ]] && is_attached_state "$UDC_STATE"; then if [[ "$FORCE_GADGET_REBUILD" == "1" ]] && is_attached_state "$UDC_STATE" \
echo "⚠️ ${GADGET_REBUILD_REASON:-Gadget state} requires a rebuild, but UDC state is '$UDC_STATE' and hard reset was not allowed." >&2 && { [[ "$EXPLICIT_GADGET_REBUILD" != "1" ]] || [[ -z ${LESAVKA_ALLOW_GADGET_RESET:-} ]]; }; then
echo "⚠️ ${GADGET_REBUILD_REASON:-Gadget state} requires a rebuild, but UDC state is '$UDC_STATE' and attached-host hard reset was not explicitly allowed." >&2
echo " Preserving the attached gadget to avoid wedging the Pi USB controller." >&2 echo " Preserving the attached gadget to avoid wedging the Pi USB controller." >&2
echo " Run during a maintenance window with LESAVKA_ALLOW_GADGET_RESET=1 LESAVKA_FORCE_GADGET_REBUILD=1 if a hard rebuild is required." >&2 echo " Run during a maintenance window with LESAVKA_ALLOW_GADGET_RESET=1 LESAVKA_FORCE_GADGET_REBUILD=1 if a hard rebuild is required." >&2
FORCE_GADGET_REBUILD=0 FORCE_GADGET_REBUILD=0

2
server/Cargo.toml
View File

@ -10,7 +10,7 @@ bench = false
[package] [package]
name = "lesavka_server" name = "lesavka_server"
version = "0.16.6" version = "0.16.7"
edition = "2024" edition = "2024"
autobins = false autobins = false

8
testing/tests/server_install_script_contract.rs
View File

@ -102,6 +102,14 @@ fn server_install_pins_hdmi_camera_and_display_defaults() {
SERVER_INSTALL.contains("LESAVKA_FORCE_GADGET_REBUILD"), SERVER_INSTALL.contains("LESAVKA_FORCE_GADGET_REBUILD"),
"install script should require an explicit force knob for attached-host gadget rebuilds" "install script should require an explicit force knob for attached-host gadget rebuilds"
); );
assert!(
SERVER_INSTALL.contains("EXPLICIT_GADGET_REBUILD=1"),
"installer should distinguish organic rebuild needs from an explicit operator hard-reset request"
);
assert!(
SERVER_INSTALL.contains("[[ \"$EXPLICIT_GADGET_REBUILD\" != \"1\" ]] || [[ -z ${LESAVKA_ALLOW_GADGET_RESET:-} ]]"),
"attached-host hard rebuilds should require both allow and explicit force flags"
);
assert!( assert!(
SERVER_INSTALL.contains("no hard gadget rebuild is needed"), SERVER_INSTALL.contains("no hard gadget rebuild is needed"),
"LESAVKA_ALLOW_GADGET_RESET should permit recovery without causing unconditional hard rebuilds" "LESAVKA_ALLOW_GADGET_RESET should permit recovery without causing unconditional hard rebuilds"