diff options
| author | Thom May <thom@may.lt> | 2018-01-29 15:54:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-29 15:54:40 +0000 |
| commit | 463da02d4f1dc1d97b79885bb3d6293dcd70de30 (patch) | |
| tree | 42e82ce92364e8c7aa9243e3f1273002427ff560 | |
| parent | 4a08b50272496afbc7015bc9a942f2086c7eb308 (diff) | |
| parent | bb01df10002e1bcbddc85063106a020ad55a6885 (diff) | |
| download | chef-463da02d4f1dc1d97b79885bb3d6293dcd70de30.tar.gz | |
Merge pull request #6806 from chef/sp/faster-msi
Add MSIFASTINSTALL property, supported by Windows Installer 5.0
| -rw-r--r-- | omnibus/Gemfile.lock | 16 | ||||
| -rw-r--r-- | omnibus/resources/chef/msi/source.wxs.erb | 7 |
2 files changed, 15 insertions, 8 deletions
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 93c4bcdc7f..9684f0347d 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -9,9 +9,9 @@ GIT GIT remote: https://github.com/chef/omnibus - revision: fd1451bca299d0d71aa2c58d63fee5120572f739 + revision: 9f281bfb7fb44aa5d152b38e73ce04805fdb8958 specs: - omnibus (5.6.3) + omnibus (5.6.4) aws-sdk (~> 2) chef-sugar (~> 3.3) cleanroom (~> 1.0) @@ -26,7 +26,7 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: 45fbdeb158cc16984a65104681d842b3d026e111 + revision: 4f03b681b46e9d7300dd6764d8b68b1f6b8a16b8 specs: omnibus-software (4.0.0) chef-sugar (>= 3.4.0) @@ -38,13 +38,13 @@ GEM addressable (2.5.2) public_suffix (>= 2.0.2, < 4.0) awesome_print (1.8.0) - aws-sdk (2.10.124) - aws-sdk-resources (= 2.10.124) - aws-sdk-core (2.10.124) + aws-sdk (2.10.125) + aws-sdk-resources (= 2.10.125) + aws-sdk-core (2.10.125) aws-sigv4 (~> 1.0) jmespath (~> 1.0) - aws-sdk-resources (2.10.124) - aws-sdk-core (= 2.10.124) + aws-sdk-resources (2.10.125) + aws-sdk-core (= 2.10.125) aws-sigv4 (1.0.2) berkshelf (4.3.5) addressable (~> 2.3, >= 2.3.4) diff --git a/omnibus/resources/chef/msi/source.wxs.erb b/omnibus/resources/chef/msi/source.wxs.erb index c49a8324f9..2249262b1f 100644 --- a/omnibus/resources/chef/msi/source.wxs.erb +++ b/omnibus/resources/chef/msi/source.wxs.erb @@ -28,6 +28,13 @@ <Media Id="1" Cabinet="ChefClient.cab" EmbedCab="yes" CompressionLevel="high" /> + <!-- + Take advantage of Windows Installer 5.0 feature (if available) to disable + checkpointing and other costings that take significant amounts of time + ref: https://msdn.microsoft.com/en-us/library/windows/desktop/dd408005(v=vs.85).aspx + --> + <Property Id="MSIFASTINSTALL" Value="7" /> + <Property Id="CHEF_SERVICE_OPTIONS_RADIO_BUTTON_GROUP" Value="None" /> <!-- |