diff options
| author | hagbard <vyosdev@derith.de> | 2019-10-21 09:45:46 -0700 |
|---|---|---|
| committer | hagbard <vyosdev@derith.de> | 2019-10-21 09:45:46 -0700 |
| commit | 64fb52a00815d57cb28c66542ee9c2ee1ef12395 (patch) | |
| tree | a1705c55011311981c7d945a76a1e5356b2750cb /scripts/install/install-image | |
| parent | 2d461fda831e78107f8aa15d8459050402571297 (diff) | |
| parent | 3a99ea6e9b8ef9ef417d38d1d0bab8d2d2401aa8 (diff) | |
| download | vyatta-cfg-system-64fb52a00815d57cb28c66542ee9c2ee1ef12395.tar.gz vyatta-cfg-system-64fb52a00815d57cb28c66542ee9c2ee1ef12395.zip | |
Merge branch 'current' into equuleus
Auto-merging scripts/rl-system.init
Auto-merging scripts/install/install-image
Auto-merging Jenkinsfile
Diffstat (limited to 'scripts/install/install-image')
| -rwxr-xr-x | scripts/install/install-image | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/install/install-image b/scripts/install/install-image index ac4d2dec..fecaeed8 100755 --- a/scripts/install/install-image +++ b/scripts/install/install-image @@ -3,6 +3,10 @@ # source in the functions source /opt/vyatta/sbin/install-functions +if [ -f /etc/profile.d/vyos-system-proxy.sh ] + then . /etc/profile.d/vyos-system-proxy.sh +fi + # export INSTALL_LOG for the scripts invoked export INSTALL_LOG=/tmp/install-$$.log # export PROGRESS_PID for the scripts invoked |