Skip to content

Commit

Permalink
Use %PROGRAMFILES% instead of $(runtime.programFiles) for service…
Browse files Browse the repository at this point in the history
… exe paths. (Azure#1718)

We have reports that the CAB installer in Windows 10 16299 and
Hyper V Server 2016 14393 does not expand `$(runtime.programFiles)` in
the paths of the service executables.

So just like 87957c9, this commit changes them
to use the `%PROGRAMFILES%` env var that gets resolved at runtime.

This commit also puts the path in double-quotes, though it somehow worked fine
even without them even though there is a space in `C:\Program Files`.

It also puts the `%PROGRAMDATA%` components added in
87957c9 in double-quotes, though that env var
doesn't have spaces on any Windows version that we know of anyway.

Fixes Azure#1528
  • Loading branch information
arsing authored Sep 17, 2019
1 parent 4151f2c commit e4ea0ae
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions edgelet/build/windows/iotedge.wm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
description="Moby Engine"
displayName="Moby Engine"
errorControl="normal"
imagePath="$(runtime.programFiles)\iotedge-moby\dockerd.exe -H npipe:////./pipe/iotedge_moby_engine --exec-opt isolation=process --run-service --data-root %PROGRAMDATA%\iotedge-moby --exec-root %PROGRAMDATA%\iotedge-moby\exec-root"
imagePath=""%PROGRAMFILES%\iotedge-moby\dockerd.exe" -H npipe:////./pipe/iotedge_moby_engine --exec-opt isolation=process --run-service --data-root "%PROGRAMDATA%\iotedge-moby" --exec-root "%PROGRAMDATA%\iotedge-moby\exec-root""
name="iotedge-moby"
objectName="LocalSystem"
sidType="unrestricted"
Expand All @@ -57,7 +57,7 @@
description="Azure IoT Edge Daemon"
displayName="Azure IoT Edge Daemon"
errorControl="normal"
imagePath="$(runtime.programFiles)\iotedge\iotedged.exe -c %PROGRAMDATA%\iotedge\config.yaml"
imagePath=""%PROGRAMFILES%\iotedge\iotedged.exe" -c "%PROGRAMDATA%\iotedge\config.yaml""
name="iotedge"
objectName="LocalSystem"
sidType="unrestricted"
Expand Down

0 comments on commit e4ea0ae

Please sign in to comment.