Skip to content

[installer][windows] Refactor WSL installation #7393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AenBleidd merged 1 commit into from
Nov 13, 2026
+487 −901
Merged

[installer][windows] Refactor WSL installation #7393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 15 additions & 15 deletions .github/workflows/windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,29 +225,29 @@ jobs:
- platform: arm64
runner: windows-11-vs2026-arm
- installation_type: normal
argument_list_alpha: "/quiet /qn /l*v alpha.log OVERRIDE_LAUNCHWSLIMAGEINSTALLER=0"
argument_list_release: "/quiet /qn /l*v release.log OVERRIDE_LAUNCHWSLIMAGEINSTALLER=0"
argument_list_install: "/quiet /qn /l*v install.log OVERRIDE_LAUNCHWSLIMAGEINSTALLER=0"
argument_list_alpha: "/quiet /qn /l*v alpha.log OVERRIDE_INSTALLWSLIMAGEINSTALLER=0"
argument_list_release: "/quiet /qn /l*v release.log OVERRIDE_INSTALLWSLIMAGEINSTALLER=0"
argument_list_install: "/quiet /qn /l*v install.log OVERRIDE_INSTALLWSLIMAGEINSTALLER=0"
argument_list_prepare: ""
- installation_type: service
argument_list_alpha: "/quiet /qn /norestart /l*v alpha.log OVERRIDE_LAUNCHWSLIMAGEINSTALLER=0 ENABLEPROTECTEDAPPLICATIONEXECUTION3=1"
argument_list_release: "/quiet /qn /norestart /l*v release.log OVERRIDE_LAUNCHWSLIMAGEINSTALLER=0 ENABLEPROTECTEDAPPLICATIONEXECUTION3=1"
argument_list_install: "/quiet /qn /norestart /l*v install.log OVERRIDE_LAUNCHWSLIMAGEINSTALLER=0 ENABLEPROTECTEDAPPLICATIONEXECUTION3=1"
argument_list_alpha: "/quiet /qn /norestart /l*v alpha.log OVERRIDE_INSTALLWSLIMAGEINSTALLER=0 ENABLEPROTECTEDAPPLICATIONEXECUTION3=1"
argument_list_release: "/quiet /qn /norestart /l*v release.log OVERRIDE_INSTALLWSLIMAGEINSTALLER=0 ENABLEPROTECTEDAPPLICATIONEXECUTION3=1"
argument_list_install: "/quiet /qn /norestart /l*v install.log OVERRIDE_INSTALLWSLIMAGEINSTALLER=0 ENABLEPROTECTEDAPPLICATIONEXECUTION3=1"
argument_list_prepare: ""
- installation_type: test_acct_mgr_login
argument_list_alpha: "/quiet /qn /l*v alpha.log OVERRIDE_LAUNCHWSLIMAGEINSTALLER=0"
argument_list_release: "/quiet /qn /l*v release.log OVERRIDE_LAUNCHWSLIMAGEINSTALLER=0"
argument_list_install: "/quiet /qn /l*v install.log OVERRIDE_LAUNCHWSLIMAGEINSTALLER=0 ACCTMGR_LOGIN=test ACCTMGR_PASSWORDHASH=0123456789abcdef"
argument_list_alpha: "/quiet /qn /l*v alpha.log OVERRIDE_INSTALLWSLIMAGEINSTALLER=0"
argument_list_release: "/quiet /qn /l*v release.log OVERRIDE_INSTALLWSLIMAGEINSTALLER=0"
argument_list_install: "/quiet /qn /l*v install.log OVERRIDE_INSTALLWSLIMAGEINSTALLER=0 ACCTMGR_LOGIN=test ACCTMGR_PASSWORDHASH=0123456789abcdef"
argument_list_prepare: ""
- installation_type: test_client_auth_file
argument_list_alpha: "/quiet /qn /norestart /l*v alpha.log OVERRIDE_LAUNCHWSLIMAGEINSTALLER=0 ENABLEPROTECTEDAPPLICATIONEXECUTION3=1"
argument_list_release: "/quiet /qn /norestart /l*v release.log OVERRIDE_LAUNCHWSLIMAGEINSTALLER=0 ENABLEPROTECTEDAPPLICATIONEXECUTION3=1"
argument_list_install: "/quiet /qn /norestart /l*v install.log OVERRIDE_LAUNCHWSLIMAGEINSTALLER=0 ENABLEPROTECTEDAPPLICATIONEXECUTION3=1 BOINC_PROJECT_USERNAME=test_user BOINC_PROJECT_PASSWORD=qwerty123456!@#$%^"
argument_list_alpha: "/quiet /qn /norestart /l*v alpha.log OVERRIDE_INSTALLWSLIMAGEINSTALLER=0 ENABLEPROTECTEDAPPLICATIONEXECUTION3=1"
argument_list_release: "/quiet /qn /norestart /l*v release.log OVERRIDE_INSTALLWSLIMAGEINSTALLER=0 ENABLEPROTECTEDAPPLICATIONEXECUTION3=1"
argument_list_install: "/quiet /qn /norestart /l*v install.log OVERRIDE_INSTALLWSLIMAGEINSTALLER=0 ENABLEPROTECTEDAPPLICATIONEXECUTION3=1 BOINC_PROJECT_USERNAME=test_user BOINC_PROJECT_PASSWORD=qwerty123456!@#$%^"
argument_list_prepare: '--create-user --username test_user --password "qwerty123456!@#$%^"'
- installation_type: test_proj_init_file
argument_list_alpha: "/quiet /qn /l*v alpha.log OVERRIDE_LAUNCHWSLIMAGEINSTALLER=0"
argument_list_release: "/quiet /qn /l*v release.log OVERRIDE_LAUNCHWSLIMAGEINSTALLER=0"
argument_list_install: "/quiet /qn /l*v install.log OVERRIDE_LAUNCHWSLIMAGEINSTALLER=0 PROJINIT_URL=https://test.com PROJINIT_NAME=test PROJINIT_AUTH=abcdef1234567890"
argument_list_alpha: "/quiet /qn /l*v alpha.log OVERRIDE_INSTALLWSLIMAGEINSTALLER=0"
argument_list_release: "/quiet /qn /l*v release.log OVERRIDE_INSTALLWSLIMAGEINSTALLER=0"
argument_list_install: "/quiet /qn /l*v install.log OVERRIDE_INSTALLWSLIMAGEINSTALLER=0 PROJINIT_URL=https://test.com PROJINIT_NAME=test PROJINIT_AUTH=abcdef1234567890"
argument_list_prepare: ""
fail-fast: false
steps:
Expand Down
84 changes: 0 additions & 84 deletions clientsetup/win/CACheckWSLSupport.cpp
View file
Open in desktop

This file was deleted.

123 changes: 0 additions & 123 deletions clientsetup/win/CALaunchBOINCWSLInstaller.cpp
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions clientsetup/win/CARestoreExecutionState.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,6 @@ class CARestoreExecutionState : public BOINCCABase {
SetProperty(_T("BOINC_PROJECT_USERNAME"),
strBOINCProjectAccountUsername);

tstring strLaunchBOINCWslImageInstaller;
GetRegistryValue(_T("LAUNCHWSLIMAGEINSTALLER"),
strLaunchBOINCWslImageInstaller);
SetProperty(_T("LAUNCHWSLIMAGEINSTALLER"),
strLaunchBOINCWslImageInstaller);

return ERROR_SUCCESS;
}
};
Expand Down
26 changes: 13 additions & 13 deletions clientsetup/win/CARestoreSetupState.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,23 +70,23 @@ class CARestoreSetupState : public BOINCCABase {
}
}

tstring strOverrideLaunchWSLImageInstaller;
GetProperty(_T("OVERRIDE_LAUNCHWSLIMAGEINSTALLER"),
strOverrideLaunchWSLImageInstaller);
if (!strOverrideLaunchWSLImageInstaller.empty()) {
SetProperty(_T("LAUNCHWSLIMAGEINSTALLER"),
strOverrideLaunchWSLImageInstaller);
tstring strOverrideInstallWSLImageInstaller;
GetProperty(_T("OVERRIDE_INSTALLWSLIMAGEINSTALLER"),
strOverrideInstallWSLImageInstaller);
if (!strOverrideInstallWSLImageInstaller.empty()) {
SetProperty(_T("INSTALLWSLIMAGEINSTALLER"),
strOverrideInstallWSLImageInstaller);
Comment thread
AenBleidd marked this conversation as resolved.
Resolved
}
else {
tstring strLaunchWSLImageInstaller;
GetRegistryValue(_T("LAUNCHWSLIMAGEINSTALLER"),
strLaunchWSLImageInstaller);
if (strLaunchWSLImageInstaller == _T("1") ||
strLaunchWSLImageInstaller.empty()) {
SetProperty(_T("LAUNCHWSLIMAGEINSTALLER"), _T("1"));
tstring strInstallWSLImageInstaller;
GetRegistryValue(_T("INSTALLWSLIMAGEINSTALLER"),
strInstallWSLImageInstaller);
Comment thread
AenBleidd marked this conversation as resolved.
Resolved
if (strInstallWSLImageInstaller == _T("1") ||
strInstallWSLImageInstaller.empty()) {
SetProperty(_T("INSTALLWSLIMAGEINSTALLER"), _T("1"));
}
else {
SetProperty(_T("LAUNCHWSLIMAGEINSTALLER"), _T(""));
SetProperty(_T("INSTALLWSLIMAGEINSTALLER"), _T(""));
}
}

Expand Down
6 changes: 0 additions & 6 deletions clientsetup/win/CASaveExecutionState.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,6 @@ class CASaveExecutionState : public BOINCCABase {
SetRegistryValue(_T("LAUNCHPROGRAM"), _T(""));
}

tstring strLaunchBOINCWslImageInstaller;
GetProperty(_T("LAUNCHWSLIMAGEINSTALLER"),
strLaunchBOINCWslImageInstaller);
SetRegistryValue(_T("LAUNCHWSLIMAGEINSTALLER"),
strLaunchBOINCWslImageInstaller);

return ERROR_SUCCESS;
}
};
Expand Down
12 changes: 6 additions & 6 deletions clientsetup/win/CASaveSetupState.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ class CASaveSetupState : public BOINCCABase {
SetRegistryValue(_T("LAUNCHPROGRAM"), _T("0"));
}

tstring strLaunchBOINCWslImageInstaller;
GetProperty(_T("LAUNCHWSLIMAGEINSTALLER"),
strLaunchBOINCWslImageInstaller);
if (_T("1") == strLaunchBOINCWslImageInstaller) {
SetRegistryValue(_T("LAUNCHWSLIMAGEINSTALLER"), _T("1"));
tstring strInstallBOINCWslImageInstaller;
GetProperty(_T("INSTALLWSLIMAGEINSTALLER"),
strInstallBOINCWslImageInstaller);
if (_T("1") == strInstallBOINCWslImageInstaller) {
SetRegistryValue(_T("INSTALLWSLIMAGEINSTALLER"), _T("1"));
}
else {
SetRegistryValue(_T("LAUNCHWSLIMAGEINSTALLER"), _T("0"));
SetRegistryValue(_T("INSTALLWSLIMAGEINSTALLER"), _T("0"));
}

tstring strBOINCMasterAccountUsername;
Expand Down
Loading
Loading