Added ISO, fixed some stuff, added packer templates to use iso

.gitignore

@@ -1,8 +1,14 @@
+*.img
 *.vmdk
+.vars
 c/*.gz
 debian
-*.swp
-*.img
-*.ova
-*.iso
+dist/*.iso
+dist/*.json
+dist/*.ova
+dist/.env
+dist/packer.tar.gz
+dist/packer/*.json
+dist/packer/packer_cache
 ova
+root

Makefile

@@ -5,7 +5,13 @@ D_CAPACITY = 10737418240
 # Git version
 VERSION = $(shell git describe --always --tags --dirty)
 
-all: Windows-${VERSION}.ova example.iso
+PACKER_VERSIONS := $(shell awk -F, '{print $$1}' debian-root/etc/versions | sed 's/win//' | sort | tr '\n' ' ')
+export SHA256SUM = $(shell sha256sum dist/Windows-${VERSION}.iso | awk '{print $$1}')
+
+all: dist/Windows-${VERSION}.ova dist/example.iso dist/Windows-${VERSION}.iso dist/packer/json
+
+asdf:
+	echo $(PACKER_VERSIONS)
 
 d.vmdk:
 	dd if=/dev/zero of=d.img bs=$$(( ${D_CAPACITY} / 10 )) count=10 conv=sparse
@@ -15,15 +21,22 @@ d.vmdk:
 	rm d.img
 	#qemu-img create -f vmdk -o subformat=streamOptimized d.vmdk "${D_CAPACITY}"
 
-c/initramfs.gz: debian.cfg debian-root/init debian-root/installer debian-root/etc/versions debian-root/au/*
+.PHONY: debian
+debian: debian/etc/shells
+
+debian/etc/shells: debian.cfg
 	rm -rf debian
 	fakeroot /usr/sbin/multistrap -f debian.cfg
-	mv debian/boot/vmlinu* c/kernel.gz
-	echo "${VERSION}" > debian/etc/version
-	rsync --progress -a --no-owner --no-group debian-root/ debian/
-	cp bootlace.com debian/usr/bin/
+
+c/initramfs.gz: debian/etc/shells debian-root/installer debian-root/etc/versions debian-root/au/*
+	cp debian/boot/vmlinu* c/kernel.gz
+	rm -rf root
+	rsync -a --no-owner --no-group --exclude boot debian/ root/
+	rsync --progress -a --no-owner --no-group debian-root/ root/
+	echo "${VERSION}" > root/etc/version
+	cp bootlace.com root/usr/bin/
 	echo "== Compressing initramfs"
-	cd debian; \
+	cd root; \
 		find . -print0 \
 		| cpio --null --owner=0:0 -o --format=newc \
 		| gzip -9 \
@@ -38,6 +51,11 @@ c.vmdk: c/initramfs.gz
 	qemu-img convert c.img -O vmdk -o subformat=streamOptimized c.vmdk
 	rm c.img
 
+c.qcow2:
+	qemu-img create -f qcow2 c.qcow2 40G
+d.qcow2:
+	qemu-img create -f qcow2 d.qcow2 10G
+
 
 .PHONY: kvm
 kvm: c/initramfs.gz c.vmdk d.vmdk
@@ -46,20 +64,25 @@ kvm: c/initramfs.gz c.vmdk d.vmdk
 
 .PHONY: clean
 clean:
-	-rm c.vmdk
-	-rm d.vmdk
-	-rm c/initramfs.gz
-	-rm -rf debian
-	-rm -rf ova
+	rm -f c.vmdk
+	rm -f d.vmdk
+	rm -f c/initramfs.gz
+	rm -rf debian
+	rm -rf ova
+	rm -f c.qcow2
+	rm -f d.qcow2
 
 .PHONY: dist-clean
 dist-clean: clean
-	-rm example.iso
-	-rm Windows*.ova
+	rm -f dist/*.iso
+	rm -f dist/*.ova
+	rm -f dist/packer/*json
+	rm -rf dist/packer/packer_cache
+	rm -rf dist/packer.tar.gz
 
 .PHONY: ova
-ova: Windows-${VERSION}.ova
-Windows-${VERSION}.ova: c.vmdk d.vmdk Windows.ovf
+ova: dist/Windows-${VERSION}.ova
+dist/Windows-${VERSION}.ova: c.vmdk d.vmdk Windows.ovf
 	mkdir -p ova
 	cp c.vmdk ova/Windows-c.vmdk
 	cp d.vmdk ova/Windows-d.vmdk
@@ -73,16 +96,46 @@ Windows-${VERSION}.ova: c.vmdk d.vmdk Windows.ovf
 	cd ova; for f in Windows-${VERSION}.ovf Windows-c.vmdk Windows-d.vmdk; do \
 		echo "SHA1 ($$f)= $$(sha1sum < $$f | awk '{print $$1}')"; \
 	done > Windows.mf
-	tar -cf Windows-${VERSION}.ova -C ova \
+	tar -cf $@ -C ova \
 		Windows-${VERSION}.ovf \
 		Windows-c.vmdk \
 		Windows-d.vmdk
 		#Windows.mf
 	rm -rf ova
 
-example.iso:
+.PHONY: iso
+iso: dist/Windows-${VERSION}.iso
+dist/Windows-${VERSION}.iso: c/initramfs.gz
+	genisoimage -J -o $@ -b grldr --boot-load-size 4 --no-emul-boot c
+
+.PHONY: kvm-iso
+kvm-iso: dist/Windows-${VERSION}.iso c.qcow2 d.qcow2
+	kvm -boot d -cdrom dist/Windows-${VERSION}.iso -m 2048 -hda c.qcow2 -hdb d.qcow2
+
+dist/example.iso:
 	genisoimage -o $@ -J -R -V example iso/
 
 .PHONY: import
 import: ova
-	VBoxManage import Windows-${VERSION}.ova
+	VBoxManage import dist/Windows-${VERSION}.ova
+
+.PHONY: dist/packer/json
+dist/packer/json: $(foreach v,$(PACKER_VERSIONS),dist/packer/win$(v).json)
+
+define make-packer-json
+dist/packer/win$1.json: packer/windows.template.json dist/Windows-${VERSION}.iso
+	VERSION=win$1 \
+	ISO_VERSION=${VERSION} \
+	OS=$$(shell awk -F, '$$$$1 == "win$1" {print $$$$2}' debian-root/etc/versions) \
+	NAME="$$(shell awk -F, '$$$$1 == "win$1" {print $$$$3}' debian-root/etc/versions)" \
+	envsubst < packer/windows.template.json > $$@
+endef
+
+$(foreach v,$(PACKER_VERSIONS),$(eval $(call make-packer-json,$(v))))
+
+dist/packer.tar.gz:
+	tar -C dist --exclude packer_cache -zcvf $@ packer
+
+.PHONY: proxmox
+proxmox: packer/win10.json
+	cd packer; PACKER_LOG=true packer build win10.json

README.md

@@ -1,18 +1,28 @@
-Self-Installing Windows OVA
-===========================
+Self-Installing Windows OVA & ISO
+=================================
 _because I can't distribute Windows_
 
 Overview
 --------
 
-This is an Virtual Machine in OVA format that will install Windows ontop of
+### OVA
+
+This is an Virtual Machine in OVA format that will install Windows on top of
 itself. I wrote this as an alternative to [packer](https://www.packer.io). This
 OVA basically downloads the evaluation version of the Windows version you select
 to one drive as installation media and then installs onto the primary drive.
 After this is done, the smaller secondary drive can be discarded to save disk
 space. If the default size of the primary drive is not large enough, it should
 be resized BEFORE booting the OVA for the first time.
 
+### ISO
+
+This is an ISO to be used with packer to fully automate a Windows install in a
+VM environment like proxmox. This should be used as the secondary boot source,
+behind the primary drive. VMs that use this ISO should also have two drives, two
+cpus, and two gigabytes of memory. There's some packer templates provided in the
+release for the ISO.
+
 ![windows 10](win10.gif)
 
 Customizing

c/menu.lst

@@ -1,5 +1,5 @@
 default 1
-timeout 0
+timeout 30
 color cyan/blue white/blue
 
 title Installer

debian-root/etc/versions

@@ -1,16 +1,16 @@
-win2k19,Windows 2019 Standard,91e3a2f1acc39af21353c7cc105c799494d7539f,https://software-download.microsoft.com/download/sg/17763.253.190108-0006.rs5_release_svc_refresh_SERVER_EVAL_x64FRE_en-us.iso
-win2k16,Windows 2016 Standard,3bb1c60417e9aeb3f4ce0eb02189c0c84a1c6691,http://download.microsoft.com/download/1/6/F/16FA20E6-4662-482A-920B-1A45CF5AAE3C/14393.0.160715-1616.RS1_RELEASE_SERVER_EVAL_X64FRE_EN-US.ISO
-win10-64-1903,Windows 10 64-bit version 1903,743fc483bb8bf1901c0534a0ae15208a5a72a3c5,https://software-download.microsoft.com/download/pr/18362.30.190401-1528.19h1_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso
-win10-64-1809,Windows 10 64-bit version 1809,369e645a197bc2ca8309cb80467a85a16eacd1a7,https://software-download.microsoft.com/download/pr/17763.107.101029-1455.rs5_release_svc_refresh_CLIENT_LTSC_EVAL_x64FRE_en-us.iso
-win10-32-1809,Windows 10 32-bit version 1809,ba8e0184c61d88b92fb88046339f8ddc58a3b372,https://software-download.microsoft.com/download/pr/17763.107.101029-1455.rs5_release_svc_refresh_CLIENT_LTSC_EVAL_x86FRE_en-us.iso
-win10-64-1804,Windows 10 64-bit version 1804,a4ea45ec1282e85fc84af49acf7a8d649c31ac5c,https://software-download.microsoft.com/download/pr/17134.1.180410-1804.rs4_release_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso
-win10-64-1703,Windows 10 64-bit version 1703,6c60f91bf0ad7b20f469ab8f80863035c517f34f,http://care.dlservice.microsoft.com/dl/download/B/8/B/B8B452EC-DD2D-4A8F-A88C-D2180C177624/15063.0.170317-1834.RS2_RELEASE_CLIENTENTERPRISEEVAL_OEMRET_X64FRE_EN-US.ISO
-win10-32,Windows 10 32-bit,1aa6d3c4451e79e69e84118ec629ad99e2ad36e7,http://care.dlservice.microsoft.com/dl/download/B/8/B/B8B452EC-DD2D-4A8F-A88C-D2180C177624/15063.0.170317-1834.RS2_RELEASE_CLIENTENTERPRISEEVAL_OEMRET_X86FRE_EN-US.ISO
-win2k12r2,Windows 2012 R2 Standard,849734f37346385dac2c101e4aacba4626bb141c,http://care.dlservice.microsoft.com/dl/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO
-win81-64,Windows 8.1 64-bit,7c7d99546077c805faae40a8864882c46f0ca141,http://care.dlservice.microsoft.com/dl/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_ENTERPRISE_EVAL_EN-US-IR3_CENA_X64FREE_EN-US_DV9.ISO
-win81-32,Windows 8.1 32-bit,4ddd0881779e89d197cb12c684adf47fd5d9e540,http://care.dlservice.microsoft.com/dl/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.17050.WINBLUE_REFRESH.140317-1640_X86FRE_ENTERPRISE_EVAL_EN-US-IR3_CENA_X86FREE_EN-US_DV9.ISO
-win8-64,Windows 8 64-bit,ae59e04462e4dc74e971d6e98d0cc1f2f3d63f1d,http://care.dlservice.microsoft.com/dl/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_ENTERPRISE_EVAL_EN-US-IR3_CENA_X64FREE_EN-US_DV9.ISO
-win8-32,Windows 8 32-bit,b18e99c38177537dc2b115c3e23a8cac1c64e537,http://care.dlservice.microsoft.com/dl/download/5/3/C/53C31ED0-886C-4F81-9A38-F58CE4CE71E8/9200.16384.WIN8_RTM.120725-1247_X86FRE_ENTERPRISE_EVAL_EN-US-HRM_CENA_X86FREE_EN-US_DV5.ISO
-win2k8r2,Windows 2008 R2 Standard,beed231a34e90e1dd9a04b3afabec31d62ce3889,http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso
-win7-64,Windows 7 64-bit,15ddabafa72071a06d5213b486a02d5b55cb7070,http://care.dlservice.microsoft.com/dl/download/evalx/win7/x64/EN/7600.16385.090713-1255_x64fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENXEVAL_EN_DVD.iso
-win7-32,Windows 7 32-bit,971fc00183a52c152fe924a6b99fdec011a871c2,http://care.dlservice.microsoft.com/dl/download/evalx/win7/x86/EN/7600.16385.090713-1255_x86fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENEVAL_EN_DVD.iso
+win2k19,win10,Windows 2019 Standard,91e3a2f1acc39af21353c7cc105c799494d7539f,https://software-download.microsoft.com/download/sg/17763.253.190108-0006.rs5_release_svc_refresh_SERVER_EVAL_x64FRE_en-us.iso
+win2k16,win10,Windows 2016 Standard,3bb1c60417e9aeb3f4ce0eb02189c0c84a1c6691,http://download.microsoft.com/download/1/6/F/16FA20E6-4662-482A-920B-1A45CF5AAE3C/14393.0.160715-1616.RS1_RELEASE_SERVER_EVAL_X64FRE_EN-US.ISO
+win10-64-1903,win10,Windows 10 64-bit version 1903,743fc483bb8bf1901c0534a0ae15208a5a72a3c5,https://software-download.microsoft.com/download/pr/18362.30.190401-1528.19h1_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso
+win10-64-1809,win10,Windows 10 64-bit version 1809,369e645a197bc2ca8309cb80467a85a16eacd1a7,https://software-download.microsoft.com/download/pr/17763.107.101029-1455.rs5_release_svc_refresh_CLIENT_LTSC_EVAL_x64FRE_en-us.iso
+win10-32-1809,win10,Windows 10 32-bit version 1809,ba8e0184c61d88b92fb88046339f8ddc58a3b372,https://software-download.microsoft.com/download/pr/17763.107.101029-1455.rs5_release_svc_refresh_CLIENT_LTSC_EVAL_x86FRE_en-us.iso
+win10-64-1804,win10,Windows 10 64-bit version 1804,a4ea45ec1282e85fc84af49acf7a8d649c31ac5c,https://software-download.microsoft.com/download/pr/17134.1.180410-1804.rs4_release_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso
+win10-64-1703,win10,Windows 10 64-bit version 1703,6c60f91bf0ad7b20f469ab8f80863035c517f34f,http://care.dlservice.microsoft.com/dl/download/B/8/B/B8B452EC-DD2D-4A8F-A88C-D2180C177624/15063.0.170317-1834.RS2_RELEASE_CLIENTENTERPRISEEVAL_OEMRET_X64FRE_EN-US.ISO
+win10-32,win10,Windows 10 32-bit,1aa6d3c4451e79e69e84118ec629ad99e2ad36e7,http://care.dlservice.microsoft.com/dl/download/B/8/B/B8B452EC-DD2D-4A8F-A88C-D2180C177624/15063.0.170317-1834.RS2_RELEASE_CLIENTENTERPRISEEVAL_OEMRET_X86FRE_EN-US.ISO
+win2k12r2,win8,Windows 2012 R2 Standard,849734f37346385dac2c101e4aacba4626bb141c,http://care.dlservice.microsoft.com/dl/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO
+win81-64,win8,Windows 8.1 64-bit,7c7d99546077c805faae40a8864882c46f0ca141,http://care.dlservice.microsoft.com/dl/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_ENTERPRISE_EVAL_EN-US-IR3_CENA_X64FREE_EN-US_DV9.ISO
+win81-32,win8,Windows 8.1 32-bit,4ddd0881779e89d197cb12c684adf47fd5d9e540,http://care.dlservice.microsoft.com/dl/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.17050.WINBLUE_REFRESH.140317-1640_X86FRE_ENTERPRISE_EVAL_EN-US-IR3_CENA_X86FREE_EN-US_DV9.ISO
+win8-64,win8,Windows 8 64-bit,ae59e04462e4dc74e971d6e98d0cc1f2f3d63f1d,http://care.dlservice.microsoft.com/dl/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_ENTERPRISE_EVAL_EN-US-IR3_CENA_X64FREE_EN-US_DV9.ISO
+win8-32,win8,Windows 8 32-bit,b18e99c38177537dc2b115c3e23a8cac1c64e537,http://care.dlservice.microsoft.com/dl/download/5/3/C/53C31ED0-886C-4F81-9A38-F58CE4CE71E8/9200.16384.WIN8_RTM.120725-1247_X86FRE_ENTERPRISE_EVAL_EN-US-HRM_CENA_X86FREE_EN-US_DV5.ISO
+win2k8r2,win7,Windows 2008 R2 Standard,beed231a34e90e1dd9a04b3afabec31d62ce3889,http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso
+win7-64,win7,Windows 7 64-bit,15ddabafa72071a06d5213b486a02d5b55cb7070,http://care.dlservice.microsoft.com/dl/download/evalx/win7/x64/EN/7600.16385.090713-1255_x64fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENXEVAL_EN_DVD.iso
+win7-32,win7,Windows 7 32-bit,971fc00183a52c152fe924a6b99fdec011a871c2,http://care.dlservice.microsoft.com/dl/download/evalx/win7/x86/EN/7600.16385.090713-1255_x86fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENEVAL_EN_DVD.iso

debian-root/installer

@@ -11,36 +11,54 @@ dialog(){
 	/usr/bin/dialog --backtitle "Windows.ova v. $(< /etc/version)" "$@"
 }
 
+check_iso(){
+	if mount /dev/sr0 /iso; then
+		# If there's no install.cmd, this must not be the iso we want
+		if [ ! -e /iso/install.cmd ]; then
+			umount /iso
+			return
+		fi
+		echo ',,7,*;' | sfdisk /dev/sdb
+		mkfs.ntfs -f -L data /dev/sdb1
+		mount /dev/sdb1 /d
+		rsync -Pa /iso/ /d/
+		if [ -e /d/variables.txt ]; then
+			. /d/variables.txt
+		fi
+		umount /d
+		umount /iso
+		if [ -n "$poweroff" ]; then
+			poweroff -f
+		else
+			echo "We're done! The iso can be removed and this OVA can be exported."
+			echo "Press enter to continue"
+			read  _
+			poweroff -f
+		fi
+	fi
+}
+
 version=""
 localmirror=""
 poweroff=""
 
 # Since we've been booted with a valid cdrom we should copy it to d, then
 # shutdown
-if mount /dev/sr0 /iso; then
+check_iso
+if ! mount /dev/sdb1 /d; then
 	echo ',,7,*;' | sfdisk /dev/sdb
 	mkfs.ntfs -f -L data /dev/sdb1
 	mount /dev/sdb1 /d
-	rsync -Pa /iso/ /d/
-	if [ -e /d/variables.txt ]; then
-		. /d/variables.txt
-	fi
-	umount /d
-	umount /iso
-	if [ -n "$poweroff" ]; then
-		poweroff -f
-	else
-		echo "We're done! The iso can be removed and this OVA can be exported."
-		echo "Press any key to continue"
-		read _
-		poweroff -f
-	fi
 fi
 
-if ! mount /dev/sdb1 /d; then
-	echo ',,7,*;' | sfdisk /dev/sdb
-	mkfs.ntfs -f -L data /dev/sdb1
-	mount /dev/sdb1 /d
+# Fetch the url= from /proc/cmdline and wget -r -np it to /d
+cmdline_url="$(grep -o ' url=[^ ]*' /proc/cmdline || true)"
+if [ -n "$cmdline_url" ]; then
+	echo "Found cmdline_url=\"$cmdline_url\""
+	cd /d
+	wget -r -np -nH "${cmdline_url:5}"
+	find . -type f
+	cd /
 fi
 
 if [ -e /d/variables.txt ]; then
@@ -50,7 +68,18 @@ if [ -e /d/variables.txt ]; then
 	localmirror="${localmirror%%$'\r'}"
 fi
 
-cmd="$(echo dialog --title '"Windows Version Selection"' --no-tags --radiolist '"Select a Windows version to install"' 20 60 13 $(awk -F, '{print $1,"\"" $2 "\"","off"}' /etc/versions) | sed 's/off/on/')"
+cmdline_version="$(grep -o ' version=[^ ]*' /proc/cmdline || true)"
+if [ -n "$cmdline_version" ]; then
+	echo "Found cmdline_version=\"$cmdline_version\""
+	version="${cmdline_version:9}"
+fi
+cmdline_localmirror="$(grep -o ' localmirror=[^ ]*' /proc/cmdline || true)"
+if [ -n "$cmdline_localmirror" ]; then
+	echo "Found cmdline_localmirror=\"$cmdline_localmirror\""
+	localmirror="${cmdline_localmirror:13}"
+fi
+
+cmd="$(echo dialog --title '"Windows Version Selection"' --no-tags --radiolist '"Select a Windows version to install"' 20 60 13 $(awk -F, '{print $1,"\"" $3 "\"","off"}' /etc/versions) | sed 's/off/on/')"
 if [ -z "$version" ]; then
 	version="$(eval "$cmd" 3>&2 2>&1 1>&3)"
 fi
@@ -68,8 +97,8 @@ if [ -z "$version" ]; then
 	poweroff -f
 fi
 
-URL="$(awk -F, "\$1 == \"$version\" {print \$4}" /etc/versions)"
-SHA1SUM="$(awk -F, "\$1 == \"$version\" {print \$3}" /etc/versions)"
+URL="$(awk -F, "\$1 == \"$version\" {print \$5}" /etc/versions)"
+SHA1SUM="$(awk -F, "\$1 == \"$version\" {print \$4}" /etc/versions)"
 
 # If local mirror isn't set, ask the user about it
 if [ -z "$localmirror" ]; then
@@ -87,11 +116,17 @@ if [ -n "$localmirror" ]; then
 fi
 
 if ! [ -e /dev/sda1 ]; then
-	mount /dev/sda /c
-	rm /c/initramfs.gz
-	rm /c/kernel.gz
-	rsync -a /c/ /newc
+	if mount /dev/sda /c; then
+		rsync -a --exclude initramfs.gz --exclude kernel.gz /c/ /newc
+	elif mount /dev/sr0 /c; then
+		rsync -a --exclude initramfs.gz --exclude kernel.gz /c/ /newc
+	else
+		echo "How did you get here?"
+		bash
+	fi
 	umount /c
+	rm -f /newc/initramfs.gz
+	rm -f /newc/kernel.gz
 	echo ',,83,*;' | sfdisk /dev/sda
 	mkfs.ext4 /dev/sda1
 	bootlace.com /dev/sda
@@ -115,6 +150,7 @@ fi
 cd /d
 7z x "/c/${version}.iso"
 wimmountrw /d/sources/boot.wim 2 /wim
+echo "au: $au"
 cp "$au" /wim/Autounattend.xml
 wimunmount --commit /wim
 cd /

debian.cfg

@@ -23,7 +23,7 @@ aptsources=Debian
 multiarch=i386
 
 [Debian]
-packages=apt rsync aria2 wimtools dialog linux-image-686 ifupdown net-tools busybox isc-dhcp-client p7zip-full ntfs-3g
+packages=apt rsync aria2 wimtools dialog linux-image-686 ifupdown net-tools busybox isc-dhcp-client p7zip-full ntfs-3g wget
 source=http://http.debian.net/debian
 architecture=i386
 keyring=debian-archive-keyring