Skip to content

Commit

Permalink
conf/ups.conf.sample, docs/man/ups.conf.txt: further clarify behavior…
Browse files Browse the repository at this point in the history
… of maxstartdelay [networkupstools#2134]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>
  • Loading branch information
jimklimov committed Oct 28, 2023
1 parent 672ecb3 commit 6a08fae
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
10 changes: 5 additions & 5 deletions conf/ups.conf.sample
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,11 @@ maxretry = 3
# Note that after this time upsdrvctl would just move
# along with its business (whether retrying the same
# driver if `maxretry>1`, or trying another driver if
# starting them all, or just exit); however the most
# recently started "stuck" driver process may be further
# initializing in the background, and might even succeed
# eventually.
# It would not be actively killed by upsdrvctl after
# starting them all, or just eventually exit); however,
# each such most recently started "stuck" driver process
# may be further initializing in the background, and
# might even succeed eventually.
# They would not be actively killed by upsdrvctl after
# this timeout expires.
#
# The default is 45 seconds.
Expand Down
9 changes: 5 additions & 4 deletions docs/man/ups.conf.txt
Original file line number Diff line number Diff line change
Expand Up @@ -249,10 +249,11 @@ system from getting stuck due to a broken driver or UPS.
+
Note that after this time `upsdrvctl` would just move along with its
business (whether retrying the same driver if `maxretry>1`, or trying
another driver if starting them all, or just exit); however the most
recently started "stuck" driver process may be further initializing
in the background, and might even succeed eventually. It would not be
actively killed by `upsdrvctl` after this timeout expires.
another driver if starting them all, or just eventually exit); however,
each such most recently started "stuck" driver process may be further
initializing in the background, and might even succeed eventually.
+
They would not be actively killed by `upsdrvctl` after this timeout expires.
+
The default is 45 seconds.

Expand Down

0 comments on commit 6a08fae

Please sign in to comment.