Compare commits

...

3 Commits

Author SHA1 Message Date
Sam Ebstein f315163bdf
release 2024.10.0 2024-10-05 07:47:45 -07:00
Sam Ebstein bb76f61615
Merge branch 'lance/fix-determinism' 2024-10-05 07:42:49 -07:00
Lance Vick 934fb903dd
fix: determinism on appended fat32 partition 2024-10-03 04:37:17 -07:00
7 changed files with 28 additions and 59 deletions

View File

@ -65,7 +65,6 @@ COPY --from=cpio . /
COPY --from=mtools . / COPY --from=mtools . /
COPY --from=xz . / COPY --from=xz . /
COPY --from=grub . / COPY --from=grub . /
COPY --from=util-linux . /
FROM base as dev FROM base as dev
COPY --from=gcc . / COPY --from=gcc . /
@ -198,6 +197,8 @@ FROM build AS install
ENV SOURCE_DATE_EPOCH=1 ENV SOURCE_DATE_EPOCH=1
RUN <<-EOF RUN <<-EOF
set -eux 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" "{}" + find iso -exec touch -hcd "@0" "{}" +
xorrisofs \ xorrisofs \
-output airgap.iso \ -output airgap.iso \
@ -217,24 +218,8 @@ RUN <<-EOF
-no-emul-boot \ -no-emul-boot \
-isohybrid-gpt-basdat \ -isohybrid-gpt-basdat \
-follow-links \ -follow-links \
-append_partition 3 0xb user.img \
iso/ 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 EOF
## Minimal Autorun SD card image ## Minimal Autorun SD card image

BIN
dist/airgap.iso (Stored with Git LFS) vendored

Binary file not shown.

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEZ1U/vaRrtxq9LgsLjkeh7DWhVR0FAma0fbsACgkQjkeh7DWh
VR0lYBAAsjKcqgoSM73lck4gSga3CWtTfZ/k7azr98HnUw5InTyTwvna2sRGL3jb
Q0pUhrPVQVmjXSyxD/hR/uLuiAfUn2Gyhp1MZS3C7jmFcRsxCJzNbByv/2bUS2+U
5TaCoxmM8SdxTqcBIyYylKzZ4ub0t3bCWUt2uPqdSqslgEReeqbzzE3jpmiUfmHE
daaZhZa3iPEr7vqq00jUGFuSEdxQCQkty0nZHzfGhHwbliiUGyH6/bb+u4v5eGYH
VEyRq0CWFgw5sywpSf3UZjR0fkd0do9z6Li1ggN2GV63I4oT3L1LltcMXtgfMp+B
SA3gz7/mJsMqM6H2ZWqUgJAZw/mZCGStftSnOTKdyEtpzagNNeePa5f4kM1ZuHF6
ehSl1nbnCeCPfedS8+oUm3v8qWiFLXz4tmYvBnfDWaUXIYpNOrvJPtatdinTNRfl
nglyEt6Olc+3vEqkrEl7JFu13Gl92mbuhhelKjM/VDheHBUZ6yrso1aLbyruO+wm
RxL3pQSCNfAnIQpSdkXga5gVvbZDDISBast3qHFuZaZFbo2p24hw0HnLAfyCrxgF
JnN3x2qqRlTzQSrVr4EEXUwUqpt5LlnQ3kDLNVYhXuqTdmyETj1YGnAXkqV/D+Z7
B7hlDdddXI5d0yDoYPAmF9N7XJCasdfutnO/8IfZ/eE989jYybE=
=eruT
-----END PGP SIGNATURE-----

View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEiII6deyqeGsP84sUjkAUeKP773IFAma0f0IACgkQjkAUeKP7
73I33w//SaGbbM9z8SYsWhii1SBnfs6NVQSwdBoO20C4gFdmZkPVDak3QoCAioaC
GjlEOEDb7SXfWi3n2z72P97dswN6dG1IxQKR1N913IWzUUEXGR0phaC+o0P1/f74
MXrcUDLwwJwZsA/0zMV6gHvONEqwgmfEO4WrEB/Ty7ueoJjsmQ2oauWytlh8CVDR
3HFwiVoAjRC2d0vKj0eL2n9pNQNEYKb+oJ/gq3sk2L8qPs1vThQguHADvqmi6V3w
+4tZqviksPXb+sve3VTsKFDbd5AXvcRY4TbPawQ5W7Aa6iK9W/yA10+zXvcHoGrA
6iMR94yI9eprBkqoeoxr2MHPk+8d9xXB16hY/h+OCPibkFFfPST9GDFcp0nk1JFH
b0bbpanBsxwN3IxTAL0a7iD2nxftZHjgiZib1lhdhLg35o9iou1V0fRPwdjepS3o
2TBvKhtNncUW/87ZhxhdkTI/iUvS0iem3KHUQXkM+ziOC5zGf+PYvMCuy2P0oSei
731aVOgxKbpEZHY0pTkuqG7U4+RWZ+KJEnxETcZWoCeY9DW/u2Dx5hukeZJbvmUo
111vBoziyocgKvKi5S3ctZaAwm2wNsE0TU/o5u9+Q5ST1wgsKJF+F0laCUQcDPwM
UyM5VznH31pChrlzRiUcsm0lMvDkx+JfTSBPOgzABMAcQ3YuTSk=
=e+q6
-----END PGP SIGNATURE-----

16
dist/manifest.9EF3B9DE0E11569A.asc vendored Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEX0Y/RMp/XXXQS9bjZBjyel4grdcFAmcBUVgACgkQZBjyel4g
rddFZg/+KnDMbbnTEmrxCcoTvYlID5+aja8jOK3mCRltAiJ0QriomdFBw4heG7fF
+EvGH0LbupyhJqMvfjQcybFFupCIZritProGuNezyxw1EGOZVD7HdhKBYibnoAth
rm4sL/iW5VjjrO15zzfUd1UFVBHc3XS881fsXJKiIKmwLF8iH1LGPdX7sJe6xrxJ
UZRhzUL4v42UaYci7ZzdTqt+3nxhLzLGxKstPkIFUeZuGvQaFgGaNCOcgCMYfkIY
DoldHiSFwniXxbtXcowlojfnF+W8ZdhYayD93MxEf5M4Mfnxyn5kX/8UVXoDDED4
fem2Z9aVhiG0WhYMqFaxkEyjKkHq64EAR5L0nO9OYWGBFCtKtZex4dO+fS9PsdP6
kCGzTWTyzj7Kk+HcOUC1wnNf9xyS69m+wLCBz/2Z6dirqzh4kLxn60bhXGKyYizr
Nd5eSn+2Gbiu9EfC8Hs5M+Q5klZj00t/xVIPK/z8gjp0yKzjxthB7j7GzJbjGXnq
rl5d4SuTjHMZPO8AEdOn6wQbmu4s59HkHXOsVLCzBgbprONmkGfFG/hitbC7WLzy
g0HSgwwsItbbrGKLEiOfxst7ojeAGQ504xhNh4f9OBD5j+QV7cX77qosKaqAUv1y
V6txF8zcGGYBadUPrH7e3Q6/FLsdSWZh+NJqVADCJDZIwXvExgc=
=tyko
-----END PGP SIGNATURE-----

4
dist/manifest.txt vendored
View File

@ -1,2 +1,2 @@
fe92783ef775ccc5e32baefb26f951b7f37ed26ecbb4601a068e20b31bebadbb airgap.iso 0a6b5fe265a0fa0d08818a30625f22fb90a9d78f3ce6db9b5c901e88f9dffaa4 airgap.iso
b714c963bd8b1f3a38295821f0a3521bc64f97c1023c49d22a2e7433385b1a09 release.env d981d364acf7570720196162aaadafb633014ddbb936e255e6c1401c835642ec release.env

10
dist/release.env vendored
View File

@ -1,5 +1,5 @@
VERSION=2024.8.1 VERSION=2024.10.0
GIT_REF=ea623cc147741b0a753ce4ea7aabe512df9a2ef9 GIT_REF=bb76f61615221d488643b7474931c3022834db7c
GIT_AUTHOR=Lance R. Vick GIT_AUTHOR=Sam Ebstein
GIT_PUBKEY=6B61ECD76088748C70590D55E90A401336C8AAA9 GIT_PUBKEY=1CB82764728C8965407C27DE9EF3B9DE0E11569A
GIT_TIMESTAMP=2024-08-08 00:34:41 -0700 GIT_TIMESTAMP=2024-10-05 07:42:49 -0700