diff options
author | Matt Wrock <matt@mattwrock.com> | 2016-12-21 17:16:42 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-21 17:16:42 -0800 |
commit | 07b25d1a5a9615eb63c6d9cbbc0816b1ca6a964c (patch) | |
tree | b91939937ff6ade3ef72300de48a71d3ea64a94c | |
parent | 03c3c222b1246b537e2121ec35330e685afee66a (diff) | |
parent | 78ccbbce07170af72f3a23c98036e2b472cb8c4e (diff) | |
download | chef-07b25d1a5a9615eb63c6d9cbbc0816b1ca6a964c.tar.gz |
Merge pull request #5657 from chef/task_name
Use the same task name used by the chef-client cookbook so that the task can be managed by its task recipie
-rw-r--r-- | omnibus/resources/chef/msi/source.wxs.erb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/omnibus/resources/chef/msi/source.wxs.erb b/omnibus/resources/chef/msi/source.wxs.erb index 9bd13ff499..c49a8324f9 100644 --- a/omnibus/resources/chef/msi/source.wxs.erb +++ b/omnibus/resources/chef/msi/source.wxs.erb @@ -71,14 +71,14 @@ <CustomAction Id="CreateChefClientScheduledTask" Directory="TARGETDIR" - ExeCommand=""[SystemFolder]SCHTASKS.EXE" /CREATE /TN "ChefClientSchTask" /SC "MINUTE" /MO "30" /F /TR "cmd /c \"[EMBEDDEDBIN]ruby.exe [PROJECTLOCATIONBIN]chef-client -L [CONFIGLOCATION]chef-client.log -c [CONFIGLOCATION]client.rb\"" /RU "NT Authority\System" /RP /RL "HIGHEST"" + ExeCommand=""[SystemFolder]SCHTASKS.EXE" /CREATE /TN "chef-client" /SC "MINUTE" /MO "30" /F /TR "cmd /c \"[EMBEDDEDBIN]ruby.exe [PROJECTLOCATIONBIN]chef-client -L [CONFIGLOCATION]chef-client.log -c [CONFIGLOCATION]client.rb\"" /RU "NT Authority\System" /RP /RL "HIGHEST"" Execute="deferred" Impersonate="no" Return="check" /> <CustomAction Id="RemoveChefClientScheduledTask" Directory="TARGETDIR" - ExeCommand=""[SystemFolder]SCHTASKS.EXE" /DELETE /TN "ChefClientSchTask" /F" + ExeCommand=""[SystemFolder]SCHTASKS.EXE" /DELETE /TN "chef-client" /F" Execute="deferred" Impersonate="no" Return="ignore" /> |