scripts: bus unit drop-in guard covers inherited globs; script usage and copy wrapper comments (row 108, #1602)
Candidate manifest 19ef7133db592787c24fa473357687a5741ccd7823627b970624c930a7611dbc from Rocko's round 1 packet (a6e4fe747), on BASE234121b30. No manifest path changed between BASE and the landing target. The bus-service.sh drop-in guard now refuses inherited mosaic-.service.d and service.d drop-ins, the header lists every flag, the unreachable install-show fakes are gone, and the stack-copy.sh wrapper carries its copy and lease comments after the line-2 marker. Filbert approved in 28489 with no findings. Sage reran the full gate at the landing target with the candidate applied. Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
@@ -7,8 +7,8 @@
|
||||
# business (mosaic-bus@<business>). Nothing here reads a capability, the
|
||||
# binding or the token. See packages/cli/README.md, "Bus host".
|
||||
#
|
||||
# render [--claude PATH] print the rendered unit on stdout
|
||||
# install [--dir DIR] [--no-reload] [--claude PATH]
|
||||
# render [--copy ID [--copies DIR]] [--pm] [--claude PATH] print the rendered unit on stdout
|
||||
# install [--copy ID [--copies DIR]] [--pm] [--dir DIR] [--no-reload] [--claude PATH]
|
||||
# write the unit (write to a temp file, then
|
||||
# rename) and run `systemctl --user daemon-reload`
|
||||
# uninstall [--dir DIR] [--no-reload]
|
||||
@@ -115,7 +115,7 @@ install_guard() {
|
||||
[ -e "$directory" ] || [ -L "$directory" ] || continue
|
||||
[ -d "$directory" ] && [ -r "$directory" ] && [ -x "$directory" ] || die "refusing: cannot inspect unit path $directory; nothing was changed"
|
||||
# * includes the empty instance, i.e. [email protected].
|
||||
for dropdir in "$directory"/mosaic-bus@*.service.d; do
|
||||
for dropdir in "$directory"/mosaic-bus@*.service.d "$directory"/mosaic-.service.d "$directory"/service.d; do
|
||||
[ -e "$dropdir" ] || [ -L "$dropdir" ] || continue
|
||||
[ -d "$dropdir" ] && [ -r "$dropdir" ] && [ -x "$dropdir" ] || die "refusing: cannot inspect drop-ins $dropdir; nothing was changed"
|
||||
for file in "$dropdir"/*.conf; do
|
||||
|
||||
@@ -66,7 +66,7 @@ wrapper() {
|
||||
[ "$(grep -Fxc "$lease" "$file" || true)" = 1 ] || die 'refusing: Q81 lease line missing or ambiguous'
|
||||
tmp="$(mktemp "$BIN/.mosaic.XXXXXX")"
|
||||
trap 'rm -f "$tmp"' EXIT
|
||||
printf '#!/usr/bin/env bash\n%s\n%s\nexec "%s/scripts/mosaic" "$@"\n' "$MARKER" "$lease" "$root" > "$tmp"
|
||||
printf '#!/usr/bin/env bash\n%s\n# CLI runs from pinned copy: %s\n# The Q81 lease probe still answers at mosaic-old.\n%s\nexec "%s/scripts/mosaic" "$@"\n' "$MARKER" "$root" "$lease" "$root" > "$tmp"
|
||||
chmod 0755 "$tmp";mv -f "$tmp" "$file";trap - EXIT
|
||||
echo "wrapper: $root"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user