diff options
| author |   sthen <sthen@openbsd.org> | 2019-08-06 10:07:45 +0000 |
|---|---|---|
| committer | sthen <sthen@openbsd.org> | 2019-08-06 10:07:45 +0000 |
| commit | 385e411d535f26dcdd6fda77501343d14c486545 (patch) | |
| tree | c11f209341b522c01bc8b25c486254d8a6398bd2 | |
| parent | if the rx ring gets empty and can't be filled, retry in the future (diff) | |
| download | wireguard-openbsd-385e411d535f26dcdd6fda77501343d14c486545.tar.xz wireguard-openbsd-385e411d535f26dcdd6fda77501343d14c486545.zip | |
raise the watchdog for sysupgrade-initiated updates from 30m to 45m.
on my anoncvs server it takes about 20m already to untar sets, which is
a bit close to the limit for my liking (we only want to trigger the
watchdog if things are *really* stuck; if it's still proceeding then
rebooting mid-upgrade can leave things in a worse state).
we can probably do something smarter (e.g. reset the watchdog after
untarring each set) but this is an easier-to-test initial improvement.
ok florian deraadt kn
| -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 328f7b03407..9e3d8c7d7d6 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.1135 2019/05/14 14:27:49 ajacoutot Exp $ +# $OpenBSD: install.sub,v 1.1136 2019/08/06 10:07:45 sthen Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org> @@ -3387,7 +3387,7 @@ elif $UU; then check_unattendedupgrade || exit 1 # trigger watchdog - (sleep 1800 && reboot) & + (sleep 2700 && reboot) & cat <<__EOT > /auto_upgrade.conf Location of sets = disk |