Suggest NUT_QUIET_INIT_UPSNOTIFY=true in sample init-scripts [#2136]

Signed-off-by: Jim Klimov <[email protected]>
networkupstools · Oct 29, 2023 · b8699df · b8699df
1 parent d0a8c8a
commit b8699df
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 1 deletion.
diff --git a/scripts/Aix/nut.init.in b/scripts/Aix/nut.init.in
@@ -40,6 +40,9 @@ NUTUSER="@RUN_AS_USER@"
 NUTGROUP="@RUN_AS_GROUP@"
 NUT_VAR_LOCK="/var/locks/ups"
 
+NUT_QUIET_INIT_UPSNOTIFY=true
+export NUT_QUIET_INIT_UPSNOTIFY
+
 if [ -f "$CONFIG" ] ; then
 	. "$CONFIG"
 

diff --git a/scripts/HP-UX/nut-drvctl.sh b/scripts/HP-UX/nut-drvctl.sh
@@ -24,6 +24,9 @@ umask 022
 PATH=/usr/sbin:/usr/bin:/sbin
 export PATH
 
+NUT_QUIET_INIT_UPSNOTIFY=true
+export NUT_QUIET_INIT_UPSNOTIFY
+
 WHAT='NUT UPS driver (Network UPS Tools -- http://www.exploits.org/nut)'
 WHAT_PATH=/opt/nut/bin/upsdrvctl
 WHAT_CONFIG=/etc/rc.config.d/nut-drvctl

diff --git a/scripts/HP-UX/nut-upsd.sh b/scripts/HP-UX/nut-upsd.sh
@@ -24,6 +24,9 @@ umask 022
 PATH=/usr/sbin:/usr/bin:/sbin
 export PATH
 
+NUT_QUIET_INIT_UPSNOTIFY=true
+export NUT_QUIET_INIT_UPSNOTIFY
+
 WHAT='NUT UPS daemon (Network UPS Tools -- http://www.exploits.org/nut)'
 WHAT_PATH=/opt/nut/sbin/upsd
 WHAT_CONFIG=/etc/rc.config.d/nut-upsd

diff --git a/scripts/HP-UX/nut-upsmon.sh b/scripts/HP-UX/nut-upsmon.sh
@@ -24,6 +24,9 @@ umask 022
 PATH=/usr/sbin:/usr/bin:/sbin
 export PATH
 
+NUT_QUIET_INIT_UPSNOTIFY=true
+export NUT_QUIET_INIT_UPSNOTIFY
+
 WHAT='NUT UPS monitor (Network UPS Tools -- http://www.exploits.org/nut)'
 WHAT_PATH=/opt/nut/sbin/upsmon
 WHAT_CONFIG=/etc/rc.config.d/nut-upsmon

diff --git a/scripts/RedHat/upsd.in b/scripts/RedHat/upsd.in
@@ -53,6 +53,9 @@ fi
 # if there are no config file, bail out
 [ -f "$UPSDCONF" ] && [ -f "$UPSCONF" ] || exit 0
 
+NUT_QUIET_INIT_UPSNOTIFY=true
+export NUT_QUIET_INIT_UPSNOTIFY
+
 runcmd() {
    echo -n "$1 "
    shift

diff --git a/scripts/RedHat/upsmon.in b/scripts/RedHat/upsmon.in
@@ -32,6 +32,9 @@ if [ -n "$NUT_SBINDIR" -a -d "$NUT_SBINDIR" ]; then
   PATH="$NUT_SBINDIR:$PATH"
 fi
 
+NUT_QUIET_INIT_UPSNOTIFY=true
+export NUT_QUIET_INIT_UPSNOTIFY
+
 # See how we are called.
 case "$1" in
   start)

diff --git a/scripts/Solaris/nut.in b/scripts/Solaris/nut.in
@@ -7,6 +7,10 @@ NUT_SBIN_DIR="${NUT_DIR}/sbin"
 NUT_LIB_DIR="${NUT_DIR}/lib"
 CONFIG="@CONFPATH@/nut.conf"
 
+# We anticipate some tighter integration with SMF later:
+#NUT_QUIET_INIT_UPSNOTIFY=true
+#export NUT_QUIET_INIT_UPSNOTIFY
+
 if [ -f "$CONFIG" ] ; then
 	. "$CONFIG"
 fi

diff --git a/scripts/Solaris/svc-nut-monitor.in b/scripts/Solaris/svc-nut-monitor.in
@@ -21,6 +21,10 @@ CONFIG="@CONFPATH@/nut.conf"
 NUTUSER="@RUN_AS_USER@"
 NUTGROUP="@RUN_AS_GROUP@"
 
+# We anticipate some tighter integration with SMF later:
+#NUT_QUIET_INIT_UPSNOTIFY=true
+#export NUT_QUIET_INIT_UPSNOTIFY
+
 if [ -f "$CONFIG" ] ; then
 	. "$CONFIG"
 fi

diff --git a/scripts/Solaris/svc-nut-server.in b/scripts/Solaris/svc-nut-server.in
@@ -31,6 +31,10 @@ NUTGROUP="`svcprop -p nut/NUTGROUP $SMF_FMRI`" \
 && [ -n "$NUTGROUP" ] \
 || NUTGROUP="@RUN_AS_GROUP@"
 
+# We anticipate some tighter integration with SMF later:
+#NUT_QUIET_INIT_UPSNOTIFY=true
+#export NUT_QUIET_INIT_UPSNOTIFY
+
 if [ -f "$CONFIG" ] ; then
 	. "$CONFIG"
 fi

diff --git a/scripts/Solaris8/S99upsmon b/scripts/Solaris8/S99upsmon
@@ -11,6 +11,9 @@ export PATH
 
 UPSDPATH=/usr/local/ups/sbin
 
+NUT_QUIET_INIT_UPSNOTIFY=true
+export NUT_QUIET_INIT_UPSNOTIFY
+
 # See how we are called.
 case "$1" in
   'start')
@@ -19,7 +22,7 @@ case "$1" in
        $UPSDPATH/upsmon >/dev/console 2>&1
        touch /var/lock/subsys/upsmon
     fi
-    ;;        
+    ;;
   'stop')
     echo "NUT Stopping UPS monitor "
     /usr/bin/pkill -x upsmon