diff options
author | 2018-02-05 22:31:40 +0000 | |
---|---|---|
committer | 2018-02-05 22:31:40 +0000 | |
commit | 1e2be1a266877ea008cef707419b083a71feb8c8 (patch) | |
tree | fb1e7b2f1db855119128763dc0c622f512e72075 | |
parent | typos (diff) | |
download | wireguard-openbsd-1e2be1a266877ea008cef707419b083a71feb8c8.tar.xz wireguard-openbsd-1e2be1a266877ea008cef707419b083a71feb8c8.zip |
If an http proxy was used when fetching sets in the ramdisk, write it to
rc.firsttime for fw_update and syspatch. From trondd at kagu-tsuchi com,
ok halex@
-rw-r--r-- | distrib/miniroot/install.sub | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 71eb873db19..8fde24d08ee 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.1056 2018/01/21 19:58:37 halex Exp $ +# $OpenBSD: install.sub,v 1.1057 2018/02/05 22:31:40 sthen Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org> @@ -2750,6 +2750,10 @@ finish_up() { [[ $MODE == upgrade ]] && echo "/usr/sbin/sysmerge -b" >>/mnt/etc/rc.sysmerge + # If a proxy was needed to fetch the sets, use it for fw_update and syspatch + [[ -n $http_proxy ]] && + echo "export http_proxy=$http_proxy" >>/mnt/etc/rc.firsttime + # Ensure that fw_update is run on reboot. echo "/usr/sbin/fw_update -v" >>/mnt/etc/rc.firsttime |