implement the d-i usbstick creator

diff --git a/bootstrap.sh b/bootstrap.sh
index b890105a176247181ba606f162881dea67832504..82205095ec588f60b5f997089972562f1fa3fd26 100644 (file)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -116,25 +116,27 @@ build_fs()
 build_di_stick()
 {
         rm -rf di-stick
-        mkdir -p live-stick/efi/boot live-stick/efi/debian/
-        wget https://d-i.debian.org/daily-images/arm64/daily/netboot/debian-installer/arm64/initrd.gz
-        mkdir initrd; cd initrd; gzip -cd ../initrd.gz | sudo cpio -imd --quiet
-        rm -rf initrd/lib/modules/*
-        cp -a ../testing/lib/modules/* initrd/lib/modules/
-        (cd initrd; find . | cpio --quiet -H newc -o | pigz > ../initrd.gz)
-        cp testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi live-stick/efi/boot/bootaa64.efi
-        cp testing/boot/vmlinuz* live-stick/vmlinuz
-        cp ../files/grub.cfg live-stick/efi/debian/grub.cfg
-        (cd live-stick; tar cf ../m1-d-i-`date "+%Y-%m-%d"`.tar .)
+        mkdir -p di-stick/efi/boot di-stick/efi/debian/
+        test -f initrd.gz || wget https://d-i.debian.org/daily-images/arm64/daily/netboot/debian-installer/arm64/initrd.gz
+        sudo rm -rf initrd; mkdir initrd; (cd initrd; gzip -cd ../initrd.gz | sudo cpio -imd --quiet)
+        sudo rm -rf initrd/lib/modules/*
+        sudo cp -a testing/lib/modules/* initrd/lib/modules/
+        sudo cp ../files/wpa.conf initrd/etc/
+        (cd initrd; find . | cpio --quiet -H newc -o | pigz > ../di-stick/initrd.gz)
+        sudo rm -rf initrd
+        cp testing/usr/lib/grub/arm64-efi/monolithic/grubaa64.efi di-stick/efi/boot/bootaa64.efi
+        cp testing/boot/vmlinuz* di-stick/vmlinuz
+        cp ../files/grub.cfg di-stick/efi/debian/grub.cfg
+        (cd di-stick; tar cf ../m1-d-i-`date "+%Y-%m-%d"`.tar .)
 }
 
 mkdir -p build
 cd build
 
-# build_m1n1
-# build_uboot
-# build_linux
-# build_rootfs
-# build_live_stick
+build_m1n1
+build_uboot
+build_linux
+build_rootfs
+build_live_stick
 build_di_stick
-# build_fs
+build_fs