Support for larger install.wim, legacy boot, image selection #5

Merged
sb10q merged 7 commits from parthy/wfvm:large-image into master 11 months ago
parthy commented 11 months ago

These changes accomplish the following:

  • Speed up the image creation by using xHCI instead of UHCI
  • Allow for installation images larger than 4 GiB (might happen with more recent Windows versions) by splitting them using wimsplit
  • Allow for image selection for installation media containing more than one (e.g., Windows 10 Pro, Windows 10 Home, ...)
  • Add support for creating legacy images in addition to UEFI ones
These changes accomplish the following: - Speed up the image creation by using xHCI instead of UHCI - Allow for installation images larger than 4 GiB (might happen with more recent Windows versions) by splitting them using wimsplit - Allow for image selection for installation media containing more than one (e.g., Windows 10 Pro, Windows 10 Home, ...) - Add support for creating legacy images in addition to UEFI ones
parthy added 4 commits 11 months ago
2eb4a9aa48 Split install.wim before creating USB image
ea2a1c45ad win: Allow for selection specific image
parthy force-pushed large-image from bc8495789f to 7da6dfb75d 11 months ago
parthy changed title from Support for larger install.wim, legacy boot, image selection to Draft: Support for larger install.wim, legacy boot, image selection 11 months ago
Poster

I'm seeing some failed automated tests in our local systems, I need to have another look.

I'm seeing some failed automated tests in our local systems, I need to have another look.
parthy force-pushed large-image from 7da6dfb75d to 1357f493bd 11 months ago
parthy changed title from Draft: Support for larger install.wim, legacy boot, image selection to Support for larger install.wim, legacy boot, image selection 11 months ago
Poster

Seems like the drive letters are not the same for legacy and efi, that might be worth a second set of eyes.

Seems like the drive letters are not the same for legacy and efi, that might be worth a second set of eyes.
astro requested changes 11 months ago
astro left a comment

Very nice, thank you!

I guess you tested both configurations (efi=false/true) thoroughly, or do you wish us to take 2-3 days for confirmation runs?

wfvm/win.nix Outdated
# USB boot
"-drive"
"id=win-install,file=usbimage.img,if=none,format=raw,readonly=on"
"id=win-install,file=usbimage.img,if=none,format=raw,readonly=on,media=${if efi then "disk" else "cdrom"}"
Poster
Collaborator

The file could be named cdimage.img in the !efi case for clarity.

The file could be named `cdimage.img` in the `!efi` case for clarity.
parthy marked this conversation as resolved
wfvm/win.nix Outdated
#!${pkgs.runtimeShell}
set -euxo pipefail
export PATH=${lib.makeBinPath [ p7zip utils.qemu libguestfs ]}:$PATH
export PATH=${lib.makeBinPath [ p7zip utils.qemu libguestfs pkgs.wimlib pkgs.cdrkit ]}:$PATH
Poster
Collaborator

pkgs.cdrkit is only required on !efi.

`pkgs.cdrkit` is only required on `!efi`.
parthy marked this conversation as resolved
wfvm/win.nix Outdated
rm win/sources/install.wim
# Split image so it fits in FAT32 partition
wimsplit win/sources/install_selected.wim win/sources/install.swm 3072
Poster
Collaborator

This could be closer to 4096 MB.

This could be closer to `4096` MB.
parthy marked this conversation as resolved
parthy added 3 commits 11 months ago
Poster

Thanks for your speedy feedback! I've made some changes, let me know if there is anything else I should address.

Given that I had some trouble with the driveLetter, it would be best if you could verify the correct functionality internally too. Right now, all our internal CI pipelines (GitLab and Hydra) are successful, but I would love the confirmation from your side before merging.

Thanks for your speedy feedback! I've made some changes, let me know if there is anything else I should address. Given that I had some trouble with the driveLetter, it would be best if you could verify the correct functionality internally too. Right now, all our internal CI pipelines (GitLab and Hydra) are successful, but I would love the confirmation from your side before merging.
parthy requested review from astro 11 months ago
astro approved these changes 11 months ago
astro left a comment

Works On My Machine

sb10q merged commit f1b52c0da7 into master 11 months ago

Reviewers

astro approved these changes 11 months ago
The pull request has been merged as f1b52c0da7.
Sign in to join this conversation.
No reviewers
No Label
No Milestone
No Assignees
2 Participants
Notifications
Due Date

No due date set.

Dependencies

This pull request currently doesn't have any dependencies.

Loading…
There is no content yet.