release 2024.10.0

Containerfile

@@ -65,6 +65,7 @@ COPY --from=cpio . /
 COPY --from=mtools . /
 COPY --from=xz . /
 COPY --from=grub . /
+COPY --from=util-linux . /
 
 FROM base as dev
 COPY --from=gcc . /
@@ -197,8 +198,6 @@ FROM build AS install
 ENV SOURCE_DATE_EPOCH=1
 RUN <<-EOF
     set -eux
-    dd if=/dev/zero bs=1M count=10 >> user.img
-    mformat -v user -i user.img -N 0 ::
     find iso -exec touch -hcd "@0" "{}" +
     xorrisofs \
         -output airgap.iso \
@@ -218,8 +217,24 @@ RUN <<-EOF
         -no-emul-boot \
         -isohybrid-gpt-basdat \
         -follow-links \
-        -append_partition 3 0xb user.img \
         iso/
+
+    # Increase ISO size by 512 MB to create space for the third partition
+    dd if=/dev/zero bs=1M count=512 >> airgap.iso
+
+    # Append a new partition that uses the additional space
+    echo ", +" | sfdisk --append airgap.iso
+
+    # Set the newly added third partition to FAT32
+    sfdisk --part-type airgap.iso 3 b
+
+    # Calculate the byte offset of the third partition
+    # This is done by finding the end of the first partition using fdisk,
+    # adding 1 sector, and multiplying by 512 (since each sector is 512 bytes).
+    OFFSET=$(fdisk -l airgap.iso | awk '/^airgap.iso1/ {print ($4 + 1) * 512}')
+
+    # Format the third partition as FAT32 and label it 'USER'
+    mformat -v USER -i airgap.iso@@$OFFSET ::
 EOF
 
 ## Minimal Autorun SD card image

dist/manifest.9EF3B9DE0E11569A.asc

@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIzBAABCgAdFiEEX0Y/RMp/XXXQS9bjZBjyel4grdcFAmcBUVgACgkQZBjyel4g
+iQIzBAABCgAdFiEEX0Y/RMp/XXXQS9bjZBjyel4grdcFAmb9q2AACgkQZBjyel4g
-rddFZg/+KnDMbbnTEmrxCcoTvYlID5+aja8jOK3mCRltAiJ0QriomdFBw4heG7fF
+rddxrg/7Bkz2oL90DI2dSp34coTszkePlI+1ysa4CGXwSKLi5IMLxb9vuUbBMYqD
-+EvGH0LbupyhJqMvfjQcybFFupCIZritProGuNezyxw1EGOZVD7HdhKBYibnoAth
++Vlp0/kzNwr08Khjz5W0XSe/9zKeVIjtZkVqeqRtZe6SJcAs2+puQ0fBF5LQHX6I
-rm4sL/iW5VjjrO15zzfUd1UFVBHc3XS881fsXJKiIKmwLF8iH1LGPdX7sJe6xrxJ
+YRMUCBV5s7/OqENSW98WS2d/S2wu+MnrkKJtufx5RJ55mq1A1W/iCS2sBsFvchTY
-UZRhzUL4v42UaYci7ZzdTqt+3nxhLzLGxKstPkIFUeZuGvQaFgGaNCOcgCMYfkIY
+GgKqDm/TQ/h92tlzOHdJUBTki+sm9RgRcGap64YU2AvZXXQsy0E2sEYhRNRpUeTI
-DoldHiSFwniXxbtXcowlojfnF+W8ZdhYayD93MxEf5M4Mfnxyn5kX/8UVXoDDED4
+g8NEkWHlanPcnF2lqzoRrHgyCAeFWFpnxglQkhSZaLhXysHuNhGoFWPJtYHj79iy
-fem2Z9aVhiG0WhYMqFaxkEyjKkHq64EAR5L0nO9OYWGBFCtKtZex4dO+fS9PsdP6
+KsuIHDbmgcBRlY4f494sQVJSrUk+9seZH/xazwEa4mzhaCioK+ZuhnpONYpQPuyi
-kCGzTWTyzj7Kk+HcOUC1wnNf9xyS69m+wLCBz/2Z6dirqzh4kLxn60bhXGKyYizr
+zB0SAsrgGo33yX30oVYyLTEIPr0YCiTyfS8smDnuPcOKsoEkWpzn7T2ygLXT5ea0
-Nd5eSn+2Gbiu9EfC8Hs5M+Q5klZj00t/xVIPK/z8gjp0yKzjxthB7j7GzJbjGXnq
+Jq2Bd49J8W31fhlN7NGRit2dTfpsfRexiPRkoKuk5viPyeuy0YExjjpWGCvE6mKF
-rl5d4SuTjHMZPO8AEdOn6wQbmu4s59HkHXOsVLCzBgbprONmkGfFG/hitbC7WLzy
+BCBRbFHbkO/f4NZFEHXb7VQ3L87QRazmd38U332xpBLzeJysBX0phFBiOBy+e9my
-g0HSgwwsItbbrGKLEiOfxst7ojeAGQ504xhNh4f9OBD5j+QV7cX77qosKaqAUv1y
+P+7c2Xb40HpOoZNymFyHNDwAersn6zKZP78uDdmhLakqM8ummK9J/h3VhcdMxvTG
-V6txF8zcGGYBadUPrH7e3Q6/FLsdSWZh+NJqVADCJDZIwXvExgc=
+74ck9AlC9UwHIRB7AyzOxAUUQv1kV5vVQnHW/w55iHq+JIbKkOs=
-=tyko
+=4IJB
 -----END PGP SIGNATURE-----

dist/manifest.txt

@@ -1,2 +1,2 @@
-0a6b5fe265a0fa0d08818a30625f22fb90a9d78f3ce6db9b5c901e88f9dffaa4 airgap.iso
+27de325f7c9c71d5c84865004bc99677ebb4b9a3d409cb6f1c1d4a85a8a8b1b7 airgap.iso
-d981d364acf7570720196162aaadafb633014ddbb936e255e6c1401c835642ec release.env
+d5832ca4657e4ae73966923cb17348214b4f3144bb5d069c9485ba80a17a7a77 release.env

dist/release.env

@@ -1,5 +1,5 @@
 VERSION=2024.10.0
-GIT_REF=bb76f61615221d488643b7474931c3022834db7c
+GIT_REF=575967e5b41984bfaafbfee76eb3e55d11a8baff
 GIT_AUTHOR=Sam Ebstein
 GIT_PUBKEY=1CB82764728C8965407C27DE9EF3B9DE0E11569A
-GIT_TIMESTAMP=2024-10-05 07:42:49 -0700
+GIT_TIMESTAMP=2024-10-02 13:19:35 -0700