Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion vs2022/installer/CoreComponents.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -350,5 +350,14 @@
Value="relocate-dir.exe C:\Users Q:\Users" />
</Component>
</ComponentGroup>
</Fragment>

<ComponentGroup Id="AutologonComponents">
<Component
Guid="{3B9CF95A-E6E1-43B2-B501-2E79F5D6C165}"
Id="Autologon"
Directory="BIN_DIR">
<File Source="$(env.QUBES_REPO)\core-agent-windows\bin\autologon.exe" />
</Component>
</ComponentGroup>
</Fragment>
</Wix>
2 changes: 2 additions & 0 deletions vs2022/installer/Package.en-us.wxl
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
<String Id="FeatureGuiDescription" Value="GUI agent for seamless integration." />
<String Id="FeatureMoveUsersTitle" Value="Move users directory to the private image" />
<String Id="FeatureMoveUsersDescription" Value="Move C:\users to Q:\Users on the Qubes Private Image disk." />
<String Id="FeatureAutologonTitle" Value="Enable user autologon with randomized password." />
<String Id="FeatureAutologonDescription" Value="NOTE: Don't enable if you use NTFS-encrypted files (EFS), access to them WILL BE LOST! All existing stored credentials (e.g. for network shares) will be invalidated." />
<String Id="FeaturePvDriversCoreTitle" Value="Xen paravirtual bus and interface drivers" />
<String Id="FeaturePvDriversCoreDescription" Value="Core Xen drivers providing kernel- and user-mode hypervisor API." />
<String Id="FeaturePvDriversNetworkTitle" Value="Xen paravirtual network drivers" />
Expand Down
25 changes: 25 additions & 0 deletions vs2022/installer/Package.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,25 @@
Impersonate="no"
Return="ignore" />

<SetProperty
Id="PrepareAutologon"
Value='"[BIN_DIR]autologon.exe"'
Sequence="execute"
Before="PrepareAutologon" />

<CustomAction
Id="PrepareAutologon"
BinaryRef="Wix4UtilCA_X64"
DllEntry="WixQuietExec"
Execute="deferred"
Impersonate="no"
Return="ignore" />

<InstallExecuteSequence>
<Custom Action="RunInstallHelper" Before="InstallFiles" />
<Custom Action="PreparePrivateImg" After="InstallFiles" Condition="NOT Installed" />
<!-- Run only if Autologon feature is being installed and not being uninstalled -->
<Custom Action="PrepareAutologon" After="InstallFiles" Condition="(&amp;Autologon=3) AND NOT (!Autologon=3)" />
<ScheduleReboot After="InstallFinalize" />
</InstallExecuteSequence>

Expand Down Expand Up @@ -115,6 +131,15 @@
<ComponentGroupRef Id="MoveUsersComponents" />
</Feature>

<Feature
Id="Autologon"
AllowAbsent="yes"
AllowAdvertise="no"
Title="!(loc.FeatureAutologonTitle)"
Description="!(loc.FeatureAutologonDescription)">
<ComponentGroupRef Id="AutologonComponents" />
</Feature>

<Feature
Id="PvDriversNetwork"
AllowAbsent="yes"
Expand Down
11 changes: 11 additions & 0 deletions vs2022/qwt.sln
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wait-for-logon", "..\..\cor
{9556A5D1-B82A-47BC-8050-A116EE418530} = {9556A5D1-B82A-47BC-8050-A116EE418530}
{AC3F4370-1B6A-4F11-8860-D932ECBDEED9} = {AC3F4370-1B6A-4F11-8860-D932ECBDEED9}
{AD828571-1DD7-45FD-B5C2-907DE485F39B} = {AD828571-1DD7-45FD-B5C2-907DE485F39B}
{C051FD1A-1DAA-437A-94C5-622566761D86} = {C051FD1A-1DAA-437A-94C5-622566761D86}
{C5293A35-58E1-4BCB-8BC7-8D0BE9503D97} = {C5293A35-58E1-4BCB-8BC7-8D0BE9503D97}
{CCBBEACD-F536-41E4-A10F-87E6271723E0} = {CCBBEACD-F536-41E4-A10F-87E6271723E0}
{DBA888E0-F486-41C5-AF4D-B4FD04330082} = {DBA888E0-F486-41C5-AF4D-B4FD04330082}
Expand Down Expand Up @@ -211,6 +212,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vchan-test", "..\..\core-vc
{E7BBCAC2-43D8-4C8F-AC60-4D6FE7D6017E} = {E7BBCAC2-43D8-4C8F-AC60-4D6FE7D6017E}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "autologon", "..\..\core-agent-windows\vs2022\autologon\autologon.vcxproj", "{C051FD1A-1DAA-437A-94C5-622566761D86}"
ProjectSection(ProjectDependencies) = postProject
{C5293A35-58E1-4BCB-8BC7-8D0BE9503D97} = {C5293A35-58E1-4BCB-8BC7-8D0BE9503D97}
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Expand Down Expand Up @@ -341,6 +347,10 @@ Global
{1522B49F-EB25-43F0-B2FA-0E8550E0AD95}.Debug|x64.Build.0 = Debug|x64
{1522B49F-EB25-43F0-B2FA-0E8550E0AD95}.Release|x64.ActiveCfg = Release|x64
{1522B49F-EB25-43F0-B2FA-0E8550E0AD95}.Release|x64.Build.0 = Release|x64
{C051FD1A-1DAA-437A-94C5-622566761D86}.Debug|x64.ActiveCfg = Debug|x64
{C051FD1A-1DAA-437A-94C5-622566761D86}.Debug|x64.Build.0 = Debug|x64
{C051FD1A-1DAA-437A-94C5-622566761D86}.Release|x64.ActiveCfg = Release|x64
{C051FD1A-1DAA-437A-94C5-622566761D86}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -374,6 +384,7 @@ Global
{A6473190-2539-46C8-8B3A-E3F649365ADE} = {F63D8E0D-4CA1-4009-9A94-92E48EFD8730}
{CE3D7948-E92D-4C76-8FD7-C0ACC4F4A5E5} = {02976611-88E7-4AEE-8C95-AA839A2A4F56}
{1522B49F-EB25-43F0-B2FA-0E8550E0AD95} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
{C051FD1A-1DAA-437A-94C5-622566761D86} = {65EE1322-30C4-4CB9-9DD7-B65962363BD7}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {DAA8D5AA-FB07-4D46-A201-1A4181E2E82C}
Expand Down