Skip to content

Commit 9ac0ea9

Browse files
adrianriobopraveenkumar
authored andcommitted
switch msi installer AddUserToHypervAdminGroup custom action to use powershell Add-LocalGroupMember cmdlet and Hyper V Administrator group identified by SID
1 parent 738b7ac commit 9ac0ea9

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

packaging/windows/product.wxs.template

+14-4
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,14 @@
3030
<RegistrySearch Id="CrcInstalledReg" Root="HKCU" Key="Software\Red Hat\Red Hat OpenShift Local" Name="installed" Type="raw" />
3131
</Property>
3232

33+
<Property Id="POWERSHELLEXE">
34+
<RegistrySearch Id="POWERSHELLEXE"
35+
Type="raw"
36+
Root="HKLM"
37+
Key="SOFTWARE\Microsoft\PowerShell\1\ShellIds\Microsoft.PowerShell"
38+
Name="Path" />
39+
</Property>
40+
3341
<util:Group Id="CrcUsersGroup" Name="crc-users" />
3442
<Directory Id="TARGETDIR" Name="SourceDir">
3543
<Directory Id="ProgramFiles64Folder">
@@ -85,12 +93,14 @@
8593
<CustomAction Id="RemoveCrcGroupRollback" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="rollback" Impersonate="no" Return="ignore" />
8694
<SetProperty Action="CARemoveCrcDaemonTask" Id="RemoveCrcDaemonTask" Value='"[System64Folder]cmd.exe" /c schtasks /delete /TN crcDaemon /F' Before='RemoveFiles' Sequence="execute"/>
8795
<CustomAction Id="RemoveCrcDaemonTask" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" Return="ignore" />
88-
8996
<SetProperty Action="CAInstallHyperv" Id="InstallHyperv" Value='"[System64Folder]dism.exe" /online /enable-feature /featureName:microsoft-hyper-v-all /NoRestart /quiet' Before="InstallHyperv" Sequence="execute"/>
9097
<CustomAction Id="InstallHyperv" BinaryKey="WixCA" DllEntry="WixQuietExec64" Execute="deferred" Impersonate="no" Return="ignore" />
91-
92-
<SetProperty Action="CAAddUserToHypervAdminGroup" Id="AddUserToHypervAdminGroup" Value='"[System64Folder]cmd.exe" /c cd /d "[INSTALLDIR]" &amp;&amp; .\crc.exe setup --log-level debug' Before="AddUserToHypervAdminGroup" Sequence="execute"/>
93-
<CustomAction Id="AddUserToHypervAdminGroup" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Impersonate="no" Return="ignore" />
98+
<SetProperty Action="CAAddUserToHypervAdminGroup"
99+
Id="AddUserToHypervAdminGroup"
100+
Value="&quot;[POWERSHELLEXE]&quot; -NonInteractive -ExecutionPolicy Bypass -NoProfile -Command &quot;Add-LocalGroupMember -Member [LogonUser] -SID S-1-5-32-578&quot;"
101+
Before="AddUserToHypervAdminGroup"
102+
Sequence="execute"/>
103+
<CustomAction Id="AddUserToHypervAdminGroup" BinaryKey="WixCA" DllEntry="WixQuietExec64" Execute="deferred" Impersonate="no" Return="ignore" />
94104

95105
<util:CloseApplication Id = "TrayRunning" Description="Please exit Red Hat OpenShift Local from tray and run the installation again." Target="crc-tray.exe" RebootPrompt="no" PromptToContinue="yes" />
96106

0 commit comments

Comments
 (0)