Skip to content

Commit b4c7cd8

Browse files
committed
smoke: the wrapper's markers go to stderr, where the journal redirect is
Three runs of missing markers, one cause: echo writes to stdout, and the wrapper's logger redirect is stderr-only. Every marker landed on VT1 while the children's log lines went to the journal — which made a redirect problem read as a SIGPIPE problem and cost three CI laps. echo >&2 on all six markers; goldens re-blessed; suite green.
1 parent 9cd2988 commit b4c7cd8

4 files changed

Lines changed: 9 additions & 9 deletions

File tree

‎src/containerfile/blocks.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ exec 2> >(exec logger -t kuma-greeter)
542542
# The wrapper knows why the session ends: compositor death, socket
543543
# timeout, or greeter exit with its status. Say so — three laps of a
544544
# silent "greeter exited without creating a session" bought this.
545-
echo "wrapper: greetd started the session (pid $$)"
545+
echo >&2 "wrapper: greetd started the session (pid $$)"
546546
niri -c /usr/share/kumaos/greeter-niri.kdl &
547547
niri_pid=$!
548548
started=$SECONDS
@@ -557,27 +557,27 @@ for _ in $(seq 1 100); do
557557
[ -n "$sock" ] && break
558558
if ! kill -0 "$niri_pid" 2>/dev/null; then
559559
wait "$niri_pid"
560-
echo "wrapper: niri died after $((SECONDS - started))s (exit $?)"
560+
echo >&2 "wrapper: niri died after $((SECONDS - started))s (exit $?)"
561561
exit 1
562562
fi
563563
sleep 0.1
564564
done
565565
if [ -z "$sock" ]; then
566-
echo "wrapper: no wayland socket after 10s, niri still alive"
566+
echo >&2 "wrapper: no wayland socket after 10s, niri still alive"
567567
exit 1
568568
fi
569-
echo "wrapper: wayland socket up after $((SECONDS - started))s"
569+
echo >&2 "wrapper: wayland socket up after $((SECONDS - started))s"
570570
571571
WAYLAND_DISPLAY=${sock##*/} /usr/bin/kuma-greeter
572572
rc=$?
573-
echo "wrapper: greeter exited rc=$rc after $((SECONDS - started))s"
573+
echo >&2 "wrapper: greeter exited rc=$rc after $((SECONDS - started))s"
574574
# the greeter only exits on success or crash: either way hand the
575575
# session back to greetd immediately, don't make it wait out its
576576
# 5-second patience on a compositor nobody is using
577577
cleanup
578578
trap - EXIT
579579
wait "$niri_pid" 2>/dev/null
580-
echo "wrapper: niri reaped (exit $?)"
580+
echo >&2 "wrapper: niri reaped (exit $?)"
581581
exit $rc
582582
"#;
583583

‎src/containerfile/goldens/everything-on.manifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ kuma-fstab-sync 8d91559a751bb9871641d2295536dac4fca72da4ca6b66787f5765cc0f191021
4949
kuma-fstab-sync.service 9d865e627355d6a5abb8ca39d00e62c41ef3effffe1eb235caeb16691622925b
5050
kuma-greeter 001555c61143bba5fc71ab136eadf5444ac9e0189bf20cc7fca15a6eb0224e25
5151
kuma-greeter-check ba4ff3ab5f84f6e5623a73a5a1c6f1384522652536f797bcad7048b3514fba5a
52-
kuma-greeter-session ce70b9cb4e772bf15b902ab00919c721db8cf8ae345734ff8995a740d6cf19b5
52+
kuma-greeter-session 7b2dc7faf6752a4445c50398fa57d0ab4da855ba4c1a4eca65eefadddb70e627
5353
kuma-greeter-tmpfiles.conf ac57bb5086c057d537a424cd2d36924a739ef48e8b74b00baeb14bc4f8c4477e
5454
kuma-home-subvol b90db7dc4eabc2b9a95bdf90e7c93a432f6b818cb36c8135cde11138b39e2766
5555
kuma-home-subvol.service af9133fe3d2a930c432880a9937c71e8842e6d0fefbd75da065dc745240e4573

‎src/containerfile/goldens/niri.manifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ kuma-fstab-sync 8d91559a751bb9871641d2295536dac4fca72da4ca6b66787f5765cc0f191021
3737
kuma-fstab-sync.service 9d865e627355d6a5abb8ca39d00e62c41ef3effffe1eb235caeb16691622925b
3838
kuma-greeter 001555c61143bba5fc71ab136eadf5444ac9e0189bf20cc7fca15a6eb0224e25
3939
kuma-greeter-check ba4ff3ab5f84f6e5623a73a5a1c6f1384522652536f797bcad7048b3514fba5a
40-
kuma-greeter-session ce70b9cb4e772bf15b902ab00919c721db8cf8ae345734ff8995a740d6cf19b5
40+
kuma-greeter-session 7b2dc7faf6752a4445c50398fa57d0ab4da855ba4c1a4eca65eefadddb70e627
4141
kuma-greeter-tmpfiles.conf ac57bb5086c057d537a424cd2d36924a739ef48e8b74b00baeb14bc4f8c4477e
4242
kuma-home-subvol b90db7dc4eabc2b9a95bdf90e7c93a432f6b818cb36c8135cde11138b39e2766
4343
kuma-home-subvol.service af9133fe3d2a930c432880a9937c71e8842e6d0fefbd75da065dc745240e4573

‎src/containerfile/goldens/nostr.manifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ kuma-fstab-sync 8d91559a751bb9871641d2295536dac4fca72da4ca6b66787f5765cc0f191021
3737
kuma-fstab-sync.service 9d865e627355d6a5abb8ca39d00e62c41ef3effffe1eb235caeb16691622925b
3838
kuma-greeter 001555c61143bba5fc71ab136eadf5444ac9e0189bf20cc7fca15a6eb0224e25
3939
kuma-greeter-check ba4ff3ab5f84f6e5623a73a5a1c6f1384522652536f797bcad7048b3514fba5a
40-
kuma-greeter-session ce70b9cb4e772bf15b902ab00919c721db8cf8ae345734ff8995a740d6cf19b5
40+
kuma-greeter-session 7b2dc7faf6752a4445c50398fa57d0ab4da855ba4c1a4eca65eefadddb70e627
4141
kuma-greeter-tmpfiles.conf ac57bb5086c057d537a424cd2d36924a739ef48e8b74b00baeb14bc4f8c4477e
4242
kuma-home-subvol b90db7dc4eabc2b9a95bdf90e7c93a432f6b818cb36c8135cde11138b39e2766
4343
kuma-home-subvol.service af9133fe3d2a930c432880a9937c71e8842e6d0fefbd75da065dc745240e4573

0 commit comments

Comments
 (0)