microsoft/WSL
1
0
Fork 0
mirror of https://github.com/microsoft/WSL.git synced 2026-04-29 03:49:39 -05:00
Code Issues Packages Projects Releases 94 Wiki Activity

Ship initrd.img in MSI using build-time generation via powershell script (#14424)

Browse Source 
* Ship initrd.img in MSI using build-time generation via tar.exe

Replace the install-time CreateInitrd/RemoveInitrd custom actions with a
build-time step that generates initrd.img using the Windows built-in
tar.exe (libarchive/bsdtar) and ships it directly in the MSI.

The install-time approach had a race condition: wsl.exe could launch
before the CreateInitrd custom action completed, causing
ERROR_FILE_NOT_FOUND for initrd.img.

Changes:
- Add CMake custom command to generate initrd.img via tar.exe --format=newc
- Add initrd.img as a regular file in the MSI tools component
- Remove CreateInitrd/RemoveInitrd custom actions from WiX, DllMain,
  and wslinstall.def
- Remove CreateCpioInitrd helper and its tests (no longer needed)
- Update pipeline build targets to build initramfs instead of init

* pr feedback

* more pr feedback

* switch to using a powershell script instead of tar.exe

* powershell script feedback

* hopefully final pr feedback

---------

Co-authored-by: Ben Hillis <benhill@ntdev.microsoft.com>
This commit is contained in:
Ben Hillis
2026-03-12 20:42:24 -07:00
committed by GitHub
parent 24c3a9adf7
commit e5cb458e67
11 changed files with 82 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
test/windows/SimpleTests.cpp
View File

@@ -296,60 +296,5 @@ class SimpleTests
VERIFY_IS_TRUE(output.find(L"/mnt/c/Program Files (x86)/Common Files") != std::wstring::npos);
VERIFY_IS_TRUE(output.find(L"/mnt/c/Users/Test User/AppData/Local/Programs/Microsoft VS Code/bin") != std::wstring::npos);
}
TEST_METHOD(CreateCpioInitrd)
{
using wsl::windows::common::filesystem::CreateCpioInitrd;
using wsl::windows::common::filesystem::TempFile;
using wsl::windows::common::filesystem::TempFileFlags;
auto validateCpio = [](size_t sourceSize) {
// Create source file with specified size
TempFile sourceFile(GENERIC_WRITE, 0, CREATE_ALWAYS, TempFileFlags::None);
std::vector<char> sourceData(sourceSize, 'X');
DWORD written;
THROW_IF_WIN32_BOOL_FALSE(
WriteFile(sourceFile.Handle.get(), sourceData.data(), static_cast<DWORD>(sourceData.size()), &written, nullptr));
sourceFile.Handle.reset();
// Create CPIO archive
TempFile destFile(0, 0, CREATE_ALWAYS, TempFileFlags::None, L"img");
CreateCpioInitrd(sourceFile.Path, destFile.Path);
// Read and validate the CPIO archive
wil::unique_hfile cpioHandle{CreateFileW(
destFile.Path.c_str(), GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr)};
THROW_LAST_ERROR_IF(!cpioHandle);
LARGE_INTEGER cpioSize{};
THROW_IF_WIN32_BOOL_FALSE(GetFileSizeEx(cpioHandle.get(), &cpioSize));
VERIFY_ARE_EQUAL(cpioSize.QuadPart % 512, 0LL); // Archive padded to 512-byte boundary
char header[111] = {};
DWORD bytesRead;
THROW_IF_WIN32_BOOL_FALSE(ReadFile(cpioHandle.get(), header, 110, &bytesRead, nullptr));
VERIFY_ARE_EQUAL(bytesRead, 110u);
// Parse CPIO newc header: magic(6) ino mode uid gid nlink mtime filesize devmajor devminor rdevmajor rdevminor namesize check
DWORD fileSize, nameSize;
VERIFY_ARE_EQUAL(sscanf_s(header, "070701%*8x%*8x%*8x%*8x%*8x%*8x%8x%*8x%*8x%*8x%*8x%8x", &fileSize, &nameSize), 2);
// Verify filename matches source file
auto expectedName = sourceFile.Path.filename().string();
VERIFY_ARE_EQUAL(nameSize, static_cast<DWORD>(expectedName.size() + 1));
std::string filename(nameSize, '\0');
THROW_IF_WIN32_BOOL_FALSE(ReadFile(cpioHandle.get(), filename.data(), nameSize, &bytesRead, nullptr));
VERIFY_ARE_EQUAL(filename.c_str(), expectedName);
VERIFY_ARE_EQUAL(fileSize, static_cast<DWORD>(sourceSize));
};
// Test various sizes to exercise 4-byte alignment padding
for (size_t size : {0, 1, 2, 3, 4, 5, 100, 1024, 4096, 65536})
{
validateCpio(size);
}
}
};
} // namespace SimpleTests