diff options
Diffstat (limited to 'src/windows/installer/wix')
-rw-r--r-- | src/windows/installer/wix/features.wxi | 4 | ||||
-rw-r--r-- | src/windows/installer/wix/files.wxi | 9 |
2 files changed, 5 insertions, 8 deletions
diff --git a/src/windows/installer/wix/features.wxi b/src/windows/installer/wix/features.wxi index b9406dec8d..57773148b1 100644 --- a/src/windows/installer/wix/features.wxi +++ b/src/windows/installer/wix/features.wxi @@ -133,9 +133,7 @@ <Feature Id="feaKfwLeashStartup" AllowAdvertise="no" Display="hidden" Level="130"> <Condition Level="30">LEASHAUTOSTART = 1</Condition> - <?if $(var.Platform) = "Intel"?> -<!-- <ComponentRef Id="csc_LeashStartup" /> --> - <?endif?> + <ComponentRef Id="csc_LeashStartup" /> </Feature> <ComponentRef Id="cmf_remove_folder" /> <?include runtime.wxi?> diff --git a/src/windows/installer/wix/files.wxi b/src/windows/installer/wix/files.wxi index 6b8d8cf789..bdad142ffb 100644 --- a/src/windows/installer/wix/files.wxi +++ b/src/windows/installer/wix/files.wxi @@ -191,11 +191,10 @@ <Registry Id="reg_leash_6" Root="HKLM" Key="Software\MIT\Leash" Name="MsLsaImport" Type="integer" Value="[LEASHMSLSAIMPORT]" KeyPath="yes"/> <Condition>LEASHMSLSAIMPORT</Condition> </Component> -<!-- <Component Win64="$(var.Win64)" Id="csc_LeashStartup" Guid="$(var.csc_LeashStartup_guid)" DiskId="1"> - <Registry Id="reg_sc_leash_marker" Root="HKLM" Key="$(var.KfwRegRoot)\Client\$(var.VersionString)" Name="LeashAutoStart" Type="integer" Value="1" KeyPath="yes" /> - <Shortcut Id="sc_leash_exe_startup" Advertise="no" Directory="StartupFolder" Name="Leash Credentials Manager.lnk" Arguments="[LEASHAUTOINIT]" Target="[dirbin]leash32.exe" Show="minimized" /> - <Condition>USELEASH</Condition> - </Component> --> + <Component Win64="$(var.Win64)" Id="csc_LeashStartup" Guid="$(var.csc_LeashStartup_guid)" DiskId="1"> + <Registry Id="reg_sc_leash_marker" Root="HKCU" Key="$(var.KfwRegRoot)\Client\$(var.VersionString)" Name="LeashAutoStart" Type="integer" Value="1" KeyPath="yes" /> + <Shortcut Id="sc_leash_exe_startup" Advertise="no" Directory="StartupFolder" Name="MIT Kerberos.lnk" Arguments="[LEASHAUTOINIT]" Target="[dirbin]MIT Kerberos.exe" Show="minimized" /> + </Component> <Component Win64="$(var.Win64)" Id="cmf_leash32_chm" Guid="$(var.cmf_leash32_chm_guid)" DiskId="1"> <File Id="fil_leash32_chm" Name="MIT Kerberos.chm" KeyPath="yes" /> |