Skip to content

Codex: fix33.prompt.md #203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nova-rey merged 1 commit into from
Dec 28, 2025
Merged

Codex: fix33.prompt.md #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build/installer-initramfs/init
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions docs/AGENT_RUNS/codex-run-20251228-1453-26.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
6 changes: 3 additions & 3 deletions installer/init/init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading