diff options
| author | Brent Baude <bbaude@redhat.com> | 2020-08-11 13:44:29 -0500 |
|---|---|---|
| committer | Brent Baude <bbaude@redhat.com> | 2020-08-25 15:20:27 -0500 |
| commit | 31180fa2b16e96d18a793520f4ccb4ba5b4b658e (patch) | |
| tree | 5da758a9077f167c9457c1d1550e5cba6a76ebf7 /contrib | |
| parent | 374b2c65cf310d86cd625f62a9b3604ae73d39c5 (diff) | |
| download | podman-31180fa2b16e96d18a793520f4ccb4ba5b4b658e.tar.gz podman-31180fa2b16e96d18a793520f4ccb4ba5b4b658e.tar.bz2 podman-31180fa2b16e96d18a793520f4ccb4ba5b4b658e.zip | |
podman-remote fixes for msi and client
correct small typo that sets the path on windows via the msi xml.
in the remote client, prompt for SSH password when no identity or alternate means of authentication are provided.
Signed-off-by: Brent Baude <bbaude@redhat.com>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/msi/podman.wxs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/contrib/msi/podman.wxs b/contrib/msi/podman.wxs index c2c2cea4f..ff8160a53 100644 --- a/contrib/msi/podman.wxs +++ b/contrib/msi/podman.wxs @@ -24,8 +24,7 @@ <CreateFolder/> </Component> <Component Id="MainExecutable" Guid="73752F94-6589-4C7B-ABED-39D655A19714"> - <File Id="520C6E17-77A2-4F41-9611-30FA763A0702" Name="podman-remote-windows.exe" Source="bin/podman-remote-windows.exe"/> - <File Id="A14218A0-4180-44AC-B109-7C63B3099DCA" Name="podman.bat" Source="podman.bat" KeyPath="yes"/> + <File Id="520C6E17-77A2-4F41-9611-30FA763A0702" Name="podman.exe" Source="bin/podman-remote-windows.exe" KeyPath="yes"/> </Component> </Directory> </Directory> @@ -33,7 +32,7 @@ </Directory> <Property Id="setx" Value="setx.exe"/> - <CustomAction Id="ChangePath" ExeCommand="PATH "%PATH%;[INSTALLDIR] "" Property="setx" Execute="deferred" Impersonate="yes" Return="check"/> + <CustomAction Id="ChangePath" ExeCommand="PATH "%PATH%;[INSTALLDIR]"" Property="setx" Execute="deferred" Impersonate="yes" Return="check"/> <Feature Id="Complete" Level="1"> <ComponentRef Id="INSTALLDIR_Component"/> |