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

Add fstype parameter to WslClient tool (#13678)

Browse Source 
Used to specify filesystem type for VHD mounting in VM
Default: ext4

Authored-by: Pooja Trivedi <trivedipooja@microsoft.com>
This commit is contained in:
Pooja Trivedi 2025-11-05 17:09:03 -05:00 committed by GitHub
parent 1c5afc41a4
commit 36bf9d4127
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/windows/common/WslClient.cpp
View File

@ -1541,6 +1541,7 @@ int WslaShell(_In_ std::wstring_view commandLine)
settings.BootTimeoutMs = 30000; settings.BootTimeoutMs = 30000;
settings.NetworkingMode = WslNetworkingModeNAT; settings.NetworkingMode = WslNetworkingModeNAT;
std::string shell = "/bin/bash"; std::string shell = "/bin/bash";
std::string fsType = "ext4";
bool help = false; bool help = false;
ArgumentParser parser(std::wstring{commandLine}, WSL_BINARY_NAME); ArgumentParser parser(std::wstring{commandLine}, WSL_BINARY_NAME);
@ -1549,6 +1550,7 @@ int WslaShell(_In_ std::wstring_view commandLine)
parser.AddArgument(reinterpret_cast<bool&>(settings.EnableDnsTunneling), L"--dns-tunneling"); parser.AddArgument(reinterpret_cast<bool&>(settings.EnableDnsTunneling), L"--dns-tunneling");
parser.AddArgument(Integer(settings.MemoryMb), L"--memory"); parser.AddArgument(Integer(settings.MemoryMb), L"--memory");
parser.AddArgument(Integer(settings.CpuCount), L"--cpu"); parser.AddArgument(Integer(settings.CpuCount), L"--cpu");
parser.AddArgument(Utf8String(fsType), L"--fstype");
parser.AddArgument(help, L"--help"); parser.AddArgument(help, L"--help");
parser.Parse(); parser.Parse();
@ -1556,7 +1558,7 @@ int WslaShell(_In_ std::wstring_view commandLine)
if (help) if (help)
{ {
const auto usage = std::format( const auto usage = std::format(
LR"({} --wsla [--vhd </path/to/vhd>] [--shell </path/to/shell>] [--memory <memory-mb>] [--cpu <cpus>] [--dns-tunneling] [--help])", LR"({} --wsla [--vhd </path/to/vhd>] [--shell </path/to/shell>] [--memory <memory-mb>] [--cpu <cpus>] [--dns-tunneling] [--fstype <fstype>] [--help])",
WSL_BINARY_NAME); WSL_BINARY_NAME);
wprintf(L"%ls\n", usage.c_str()); wprintf(L"%ls\n", usage.c_str());
@ -1575,7 +1577,7 @@ int WslaShell(_In_ std::wstring_view commandLine)
ULONG Lun{}; ULONG Lun{};
THROW_IF_FAILED(virtualMachine->AttachDisk(vhd.c_str(), true, &diskDevice, &Lun)); THROW_IF_FAILED(virtualMachine->AttachDisk(vhd.c_str(), true, &diskDevice, &Lun));
THROW_IF_FAILED(virtualMachine->Mount(diskDevice.get(), "/mnt", "ext4", "ro", WslMountFlagsChroot | WslMountFlagsWriteableOverlayFs)); THROW_IF_FAILED(virtualMachine->Mount(diskDevice.get(), "/mnt", fsType.c_str(), "ro", WslMountFlagsChroot | WslMountFlagsWriteableOverlayFs));
THROW_IF_FAILED(virtualMachine->Mount(nullptr, "/dev", "devtmpfs", "", 0)); THROW_IF_FAILED(virtualMachine->Mount(nullptr, "/dev", "devtmpfs", "", 0));
THROW_IF_FAILED(virtualMachine->Mount(nullptr, "/sys", "sysfs", "", 0)); THROW_IF_FAILED(virtualMachine->Mount(nullptr, "/sys", "sysfs", "", 0));
THROW_IF_FAILED(virtualMachine->Mount(nullptr, "/proc", "proc", "", 0)); THROW_IF_FAILED(virtualMachine->Mount(nullptr, "/proc", "proc", "", 0));