diff options
| author | kn <kn@cvs.openbsd.org> | 2019-08-21 17:39:31 +0000 |
|---|---|---|
| committer | kn <kn@cvs.openbsd.org> | 2019-08-21 17:39:31 +0000 |
| commit | 31b1c5a5497287ee9ab9b78f2fc97b507042e993 (patch) | |
| tree | 2aee40b03861e99f607c9305161bccc2c910cd95 | |
| parent | 8cb1a48eef9deacb41419fd5c2bf34a9e1665667 (diff) | |
Lower syspugrade timeout to 30 minutes
The previous mechanism used a single timeout for the entire upgrade which
was kept when introducing the per-set watchdog.
Half an hour now seems more sensible to safely catch the biggest sets on
slow hardware, so avoid needlessly stalling (failed) upgrades for too long.
OK sthen deraadt
| -rw-r--r-- | distrib/miniroot/install.sub | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 3914a496046..ee6184b5f83 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.1139 2019/08/14 19:32:41 naddy Exp $ +# $OpenBSD: install.sub,v 1.1140 2019/08/21 17:39:30 kn Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org> @@ -3239,7 +3239,7 @@ check_unattendedupgrade() { ) > /dev/null 2>&1 } -WATCHDOG_PERIOD_SEC=$((45 * 60)) +WATCHDOG_PERIOD_SEC=$((30 * 60)) # Restart the background timer. reset_watchdog() { |