From a02b163665f3d3d22a12dc0b618355ea3959bf83 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Wed, 21 Jan 2026 00:58:37 +0000 Subject: Better dry run messages in s6-rc --- src/s6-rc/s6-rc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/s6-rc/s6-rc.c b/src/s6-rc/s6-rc.c index 1b753e9..f48227f 100644 --- a/src/s6-rc/s6-rc.c +++ b/src/s6-rc/s6-rc.c @@ -306,7 +306,7 @@ static void examine (unsigned int i, int h) pidindex[npids++].i = i ; if (verbosity >= 2) { - strerr_warni4x("service ", name, ": ", h ? "starting" : "stopping") ; + strerr_warni5x(dryrun[0] ? "dry run: " : "", "service ", name, ": ", h ? "starting" : "stopping") ; } } else @@ -337,7 +337,7 @@ static inline void on_success (unsigned int i, int h) if (h) state[i] |= 1 ; else state[i] &= 254 ; announce() ; if (verbosity >= 2) - strerr_warni5x(dryrun[0] ? "simulation: " : "", "service ", db->string + db->services[i].name, " successfully st", h ? "arted" : "opped") ; + strerr_warni5x(dryrun[0] ? "dry run: " : "", "service ", db->string + db->services[i].name, " successfully st", h ? "arted" : "opped") ; if (!lameduck) broadcast_success(i, h) ; } @@ -348,7 +348,7 @@ static inline void on_failure (unsigned int i, int h, int crashed, unsigned int { char fmt[UINT_FMT] ; fmt[uint_fmt(fmt, code)] = 0 ; - strerr_warnwu7x(dryrun[0] ? "pretend to " : "", h ? "start" : "stop", " service ", db->string + db->services[i].name, ": command ", crashed ? "crashed with signal " : "exited ", fmt) ; + strerr_warnwu7x(dryrun[0] ? "(dry run) " : "", h ? "start" : "stop", " service ", db->string + db->services[i].name, ": command ", crashed ? "crashed with signal " : "exited ", fmt) ; } } -- cgit v1.3.1