parthy
/
wfvm
forked from M-Labs/wfvm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: parthy:1357f493bd68fdc4b2cccb9e49a8ed881341ef96
Branches Tags
parthy:master
parthy:large-image
M-Labs:master
...
compare: parthy:f1b52c0da7574929ee0be355edace54387daa52f
Branches Tags
parthy:large-image
parthy:master
M-Labs:master

3 Commits
1357f493bd ... f1b52c0da7

Author SHA1 Message Date
Markus Partheymüller f1b52c0da7 autounattend: Revert back to driveLetter D 2021-03-10 13:35:49 +01:00
Markus Partheymüller 0becb115f6 win: Use maximum size to split install.wim 2021-03-10 11:10:09 +01:00
Markus Partheymüller 84ef1ec7e5 win: cdimage naming, closure shrinking 2021-03-10 11:09:49 +01:00
2 changed files with 5 additions and 5 deletions
Show Stats Expand all files Collapse all files

2
wfvm/autounattend.nix
View File

@ -13,8 +13,8 @@
, timeZone ? "UTC" , timeZone ? "UTC"
, services ? {} , services ? {}
, impureShellCommands ? [] , impureShellCommands ? []
, driveLetter ? "D:"
, efi ? true , efi ? true
, driveLetter ? if efi then "E:" else "D:"
, ... , ...
}: }:

8
wfvm/win.nix
View File

@ -86,7 +86,7 @@ let
"usb-storage,drive=virtio-win" "usb-storage,drive=virtio-win"
# USB boot # USB boot
"-drive" "-drive"
"id=win-install,file=usbimage.img,if=none,format=raw,readonly=on,media=${if efi then "disk" else "cdrom"}" "id=win-install,file=${if efi then "usb" else "cd"}image.img,if=none,format=raw,readonly=on,media=${if efi then "disk" else "cdrom"}"
"-device" "-device"
"usb-storage,drive=win-install" "usb-storage,drive=win-install"
# Output image # Output image
@ -99,7 +99,7 @@ let
'' ''
#!${pkgs.runtimeShell} #!${pkgs.runtimeShell}
set -euxo pipefail set -euxo pipefail
export PATH=${lib.makeBinPath [ p7zip utils.qemu libguestfs pkgs.wimlib pkgs.cdrkit ]}:$PATH export PATH=${lib.makeBinPath [ p7zip utils.qemu libguestfs pkgs.wimlib ]}:$PATH
# Create a bootable "USB" image # Create a bootable "USB" image
# Booting in USB mode circumvents the "press any key to boot from cdrom" prompt # Booting in USB mode circumvents the "press any key to boot from cdrom" prompt
@ -120,7 +120,7 @@ let
rm win/sources/install.wim rm win/sources/install.wim
# Split image so it fits in FAT32 partition # Split image so it fits in FAT32 partition
wimsplit win/sources/install_selected.wim win/sources/install.swm 3072 wimsplit win/sources/install_selected.wim win/sources/install.swm 4096
rm win/sources/install_selected.wim rm win/sources/install_selected.wim
cp ${autounattend.autounattendXML} win/autounattend.xml cp ${autounattend.autounattendXML} win/autounattend.xml
@ -128,7 +128,7 @@ let
${if efi then '' ${if efi then ''
virt-make-fs --partition --type=fat win/ usbimage.img virt-make-fs --partition --type=fat win/ usbimage.img
'' else '' '' else ''
mkisofs -iso-level 4 -l -R -udf -D -b boot/etfsboot.com -no-emul-boot -boot-load-size 8 -hide boot.catalog -eltorito-alt-boot -o usbimage.img win/ ${pkgs.cdrkit}/bin/mkisofs -iso-level 4 -l -R -udf -D -b boot/etfsboot.com -no-emul-boot -boot-load-size 8 -hide boot.catalog -eltorito-alt-boot -o cdimage.img win/
''} ''}
rm -rf win rm -rf win