microsoft/WSL
1
0
Fork 0
mirror of https://github.com/microsoft/WSL.git synced 2025-12-10 00:44:55 -06:00
Code Issues Packages Projects Releases 94 Wiki Activity

wslg: update to latest version which uses wslinfo --vm-id instead of env var (#13361)

Browse Source 
Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>
This commit is contained in:
Ben Hillis 2025-08-08 13:29:29 -07:00 committed by GitHub
parent 3794ba3496
commit ca1f883dd0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages.config
View File

@ -24,7 +24,7 @@
<package id="Microsoft.WSL.LxUtil.amd64fre" version="10.0.26100.1-240331-1435.ge-release" />
<package id="Microsoft.WSL.LxUtil.arm64fre" version="10.0.26100.1-240331-1435.ge-release" />
<package id="Microsoft.WSL.TestDistro" version="2.5.7-47" />
<package id="Microsoft.WSLg" version="1.0.66" />
<package id="Microsoft.WSLg" version="1.0.69" />
<package id="Microsoft.Xaml.Behaviors.WinUI.Managed" version="3.0.0" />
<package id="StrawberryPerl" version="5.28.0.1" />
<package id="vswhere" version="3.1.7" />

9
src/linux/init/init.cpp
View File

@ -2250,14 +2250,7 @@ Return Value:
if (Value != nullptr)
{
Config.VmId = Value;
// Unset the environment variable for user distros.
// TODO: this can be removed when WSLg is updated to use `wslinfo --vm-id` instead of the environment variable.
Value = getenv(LX_WSL2_SYSTEM_DISTRO);
if (!Value || strcmp(Value, "1") != 0)
{
unsetenv(LX_WSL2_VM_ID_ENV);
}
unsetenv(LX_WSL2_VM_ID_ENV);
}
//

5
src/linux/init/main.cpp
View File

@ -1827,11 +1827,6 @@ try
AddEnvironmentVariable(LX_WSL2_USER_PROFILE, UserProfile);
AddEnvironmentVariable(LX_WSL2_NETWORKING_MODE_ENV, std::to_string(static_cast<int>(Config.NetworkingMode)).c_str());
if (UserProfile)
{
AddEnvironmentVariable(LX_WSL2_SYSTEM_DISTRO, "1");
}
if (DistroInitPid.has_value())
{
AddEnvironmentVariable(LX_WSL2_DISTRO_INIT_PID, std::to_string(static_cast<int>(DistroInitPid.value())).c_str());

1
src/shared/inc/lxinitshared.h
View File

@ -255,7 +255,6 @@ Abstract:
#define LX_WSL2_SHARED_MEMORY_OB_DIRECTORY "WSL2_SHARED_MEMORY_OB_DIRECTORY"
#define LX_WSL2_INSTALL_PATH "WSL2_INSTALL_PATH"
#define LX_WSL2_SAFE_MODE "WSL2_SAFE_MODE"
#define LX_WSL2_SYSTEM_DISTRO "WSL2_SYSTEM_DISTRO"
#define LX_WSL2_USER_PROFILE "WSL2_USER_PROFILE"
#define LX_WSL2_VM_ID_ENV "WSL2_VM_ID"
#define LX_WSL_PID_ENV "WSL2_PID"