Merge cccbd87 into f33d134

Author: jimklimov

NEWS.adoc

@@ -213,6 +213,16 @@ https://github.com/networkupstools/nut/milestone/9
      with either or both, maximizing compatibility with old and new setups.
      [#2946]
 
+ - `upsmon` client:
+   * Clearer debug logging of `SHUTDOWNCMD` and `NOTIFYCMD` that would be used
+     (or warnings that none was set); flush output buffers after these messages
+     and after each main loop cycle, so any emitted text is seen in a timely
+     manner. [issue #3003, PR #3008]
+
+ - The `nutshutdown` script (end-game integration for UPS power-off in case
+   of FSD initiated by `upsmon`) was updated to consider `MODE=none` set in
+   `nut.conf` and bail out quietly. [issue #2935, PR #3008]
+
  - Manual page recipes and contents:
    * Introduced handling (possibly rewriting) for man page section "Overviews,
      conventions, and miscellaneous" (commonly number 7), to deliver support

clients/upsmon.c

@@ -3823,11 +3823,22 @@ int main(int argc, char *argv[])
 	if (checking_flag)
 		exit(check_pdflag());
 
-	if (shutdowncmd == NULL)
+	if (shutdowncmd == NULL) {
 		printf("Warning: no shutdown command defined%s\n",
 			(minsupplies < 1)
 			? ", but that is OK for a monitoring-only client."
 			: "!");
+		fflush(stdout);
+	} else {
+		upsdebugx(1, "will use a shutdown command (SHUTDOWNCMD): '%s'", shutdowncmd);
+	}
+
+	if (notifycmd == NULL) {
+		printf("Warning: no custom notification command defined, just so you know\n");
+		fflush(stdout);
+	} else {
+		upsdebugx(1, "will use custom notification command (NOTIFYCMD): '%s'", notifycmd);
+	}
 
 	/* we may need to get rid of a flag from a previous shutdown */
 	if (powerdownflag != NULL)
@@ -4162,8 +4173,10 @@ int main(int argc, char *argv[])
 		}
 
 end_loop_cycle:
-		/* No-op to avoid a warning about label at end of compound statement */
-		(void)1;
+		/* If anyone printed anything, be sure it is output
+		 * in a timely manner, not buffered indefinitely: */
+		fflush(stdout);
+		fflush(stderr);
 	}
 
 	upslogx(LOG_INFO, "Signal %d: exiting", exit_flag);

scripts/systemd/nutshutdown.in

@@ -37,6 +37,17 @@ if [ -s "@CONFPATH@/nut.conf" ]; then
     . "@CONFPATH@/nut.conf" || true
 fi
 
+if [ x"${MODE}" = xnone ]; then
+    # Per https://github.com/networkupstools/nut/issues/2935
+    # it is possible that NUT gets administratively disabled
+    # some time after a POWERDOWNFLAG file is created, and
+    # before it is deleted. In this case it never got deleted,
+    # and if that was in a persistent location - then every OS
+    # shutdown or reboot got treated as FSD with UPS power-off.
+    echo "$@: MODE=none so quetly exiting" >&2
+    exit 0
+fi
+
 [ x"${POWEROFF_QUIET-}" = xtrue ] \
 || POWEROFF_QUIET="false"