diff --git a/build/installer-initramfs/init b/build/installer-initramfs/init index a2f9bab..3c64580 100755 --- a/build/installer-initramfs/init +++ b/build/installer-initramfs/init @@ -574,15 +574,15 @@ sp_populate_by_label_namespace() { mkdir -p "$label_dir" >/dev/null 2>&1 || true - SP_BLKID_BIN="${SP_BLKID_BIN:-blkid}" - if ! command -v "${SP_BLKID_BIN}" >/dev/null 2>&1; then + blkid_bin="${SP_BLKID_BIN:-blkid}" + if ! command -v "${blkid_bin}" >/dev/null 2>&1; then sp_log "[SP-INSTALLER][FATAL] blkid missing; cannot populate by-label namespace" export SP_RESCUE_REASON="missing-blkid" sp_enter_rescue_mode "missing-blkid" return 1 fi - if ! blkid_output="$("${SP_BLKID_BIN}" -o export 2>/dev/null)"; then + if ! blkid_output="$("${blkid_bin}" -o export 2>/dev/null)"; then sp_log "[SP-INSTALLER][FATAL] blkid failed; cannot populate by-label namespace" export SP_RESCUE_REASON="missing-blkid" sp_enter_rescue_mode "missing-blkid" diff --git a/docs/AGENT_RUNS/codex-run-20251228-1453-26.md b/docs/AGENT_RUNS/codex-run-20251228-1453-26.md new file mode 100644 index 0000000..db1bef3 --- /dev/null +++ b/docs/AGENT_RUNS/codex-run-20251228-1453-26.md @@ -0,0 +1,4 @@ +Updated both `sp_populate_by_label_namespace` helpers so they set `blkid_bin="${SP_BLKID_BIN:-blkid}"` and call `command -v`/`"$blkid_bin" -o export` through that local variable, keeping the existing rescue logging intact (installer/init/init.sh:571, build/installer-initramfs/init:571). + +- Tests: `shellcheck -x installer/init/init.sh build/installer-initramfs/init` +- Suggestions: 1. Let CI run to ensure the regex around `"$blkid_bin" -o export` now passes downstream checks. \ No newline at end of file diff --git a/installer/init/init.sh b/installer/init/init.sh index a2f9bab..3c64580 100755 --- a/installer/init/init.sh +++ b/installer/init/init.sh @@ -574,15 +574,15 @@ sp_populate_by_label_namespace() { mkdir -p "$label_dir" >/dev/null 2>&1 || true - SP_BLKID_BIN="${SP_BLKID_BIN:-blkid}" - if ! command -v "${SP_BLKID_BIN}" >/dev/null 2>&1; then + blkid_bin="${SP_BLKID_BIN:-blkid}" + if ! command -v "${blkid_bin}" >/dev/null 2>&1; then sp_log "[SP-INSTALLER][FATAL] blkid missing; cannot populate by-label namespace" export SP_RESCUE_REASON="missing-blkid" sp_enter_rescue_mode "missing-blkid" return 1 fi - if ! blkid_output="$("${SP_BLKID_BIN}" -o export 2>/dev/null)"; then + if ! blkid_output="$("${blkid_bin}" -o export 2>/dev/null)"; then sp_log "[SP-INSTALLER][FATAL] blkid failed; cannot populate by-label namespace" export SP_RESCUE_REASON="missing-blkid" sp_enter_rescue_mode "missing-blkid"