From 97bbb88779c0f9ed45497ec3798f90386512d567 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Wed, 3 Jul 2024 19:57:49 +0200 Subject: [PATCH] trisquel-automatic-netinstall-qemu: Use trisquel_11.0_amd64.iso for packages cache. Signed-off-by: Denis 'GNUtoo' Carikli --- .../Makefile.am | 36 ++++++++++++------ .../configure.ac | 38 ++++++++++--------- trisquel-automatic-netinstall-qemu/grub.cfg | 1 + .../preseed.cfg | 10 ++++- .../trisquel-netinst_11.0_amd64.iso.asc | 16 -------- .../trisquel_11.0_amd64.iso.asc | 16 ++++++++ 6 files changed, 69 insertions(+), 48 deletions(-) delete mode 100644 trisquel-automatic-netinstall-qemu/trisquel-netinst_11.0_amd64.iso.asc create mode 100644 trisquel-automatic-netinstall-qemu/trisquel_11.0_amd64.iso.asc diff --git a/trisquel-automatic-netinstall-qemu/Makefile.am b/trisquel-automatic-netinstall-qemu/Makefile.am index e219afd..3d5476e 100644 --- a/trisquel-automatic-netinstall-qemu/Makefile.am +++ b/trisquel-automatic-netinstall-qemu/Makefile.am @@ -17,27 +17,35 @@ if WANT_KVM EXTRA_QEMU_ARGS += -enable-kvm endif # WANT_KVM -gnupg/pubring.kbx: +gnupg/pubring.kbx: ${srcdir}/D24DDAC9226D5BA5E9F3BED3F5DAAAF74AD4C938.asc install -d gnupg gpg \ --home=gnupg \ - --import ${srcdir}/D24DDAC9226D5BA5E9F3BED3F5DAAAF74AD4C938.asc || \ - rm -rf gnupg + --import \ + ${srcdir}/D24DDAC9226D5BA5E9F3BED3F5DAAAF74AD4C938.asc || \ + rm -rf gnupg - gpg --home=gnupg --verify trisquel-netinst_11.0_amd64.iso.asc $(TRISQUEL_NETINSTALL) +.PHONY: check-trisquel-installation-image +check-trisquel-installation-image: $(TRISQUEL_INSTALLATION_IMAGE) gnupg/pubring.kbx + gpg --home=gnupg \ + --verify trisquel_11.0_amd64.iso.asc \ + $(TRISQUEL_INSTALLATION_IMAGE) -grub/boot/linux: Makefile $(TRISQUEL_NETINSTALL) +grub/boot/linux: Makefile check-trisquel-installation-image install -D -d grub/boot xorriso -osirrox on \ - -indev $(TRISQUEL_NETINSTALL) \ - -extract /linux $@ + -indev $(TRISQUEL_INSTALLATION_IMAGE) \ + -extract /casper/vmlinuz.netinst $@ chmod 770 $@ -grub/boot/initrd.gz: Makefile $(TRISQUEL_NETINSTALL) +grub/boot/initrd.gz: Makefile check-trisquel-installation-image + gpg --home=gnupg \ + --verify trisquel_11.0_amd64.iso.asc \ + $(TRISQUEL_INSTALLATION_IMAGE) install -D -d grub/boot xorriso -osirrox on \ - -indev $(TRISQUEL_NETINSTALL) \ - -extract /initrd.gz $@ + -indev $(TRISQUEL_INSTALLATION_IMAGE) \ + -extract /casper/initrd.netinst $@ chmod 770 $@ grub/boot/grub/grub.cfg: Makefile grub.cfg @@ -67,8 +75,12 @@ rootfs.img: preseed.img rootfs.img.tmp grub.iso -nographic \ -drive file=grub.iso,index=2,media=cdrom,if=ide \ -drive file=rootfs.img.tmp,index=1,media=disk,if=virtio \ - -drive file=preseed.img,index=0,media=disk,if=none,format=raw,id=usb \ - -usb -device usb-ehci,id=ehci -device usb-storage,bus=ehci.0,drive=usb \ + -drive file=preseed.img,index=0,media=disk,if=none,format=raw,id=usb1 \ + -drive file=$(TRISQUEL_INSTALLATION_IMAGE),index=3,media=cdrom,if=none,format=raw,id=usb2 \ + -usb -device usb-ehci,id=ehci1 \ + -device usb-storage,bus=ehci1.0,drive=usb1 \ + -usb -device usb-ehci,id=ehci2 \ + -device usb-storage,bus=ehci2.0,drive=usb2 \ $(EXTRA_QEMU_ARGS) || \ \ rm -f rootfs.img diff --git a/trisquel-automatic-netinstall-qemu/configure.ac b/trisquel-automatic-netinstall-qemu/configure.ac index 84d92e5..3412494 100644 --- a/trisquel-automatic-netinstall-qemu/configure.ac +++ b/trisquel-automatic-netinstall-qemu/configure.ac @@ -14,14 +14,15 @@ # along with this program. If not, see . AC_PREREQ([2.69]) -AC_INIT([trisquel-automatic-netinstall-qemu], [0.1], [GNUtoo@cyberdimension.org]) +AC_INIT([trisquel-automatic-netinstall-qemu], [0.1], + [GNUtoo@cyberdimension.org]) AC_CONFIG_SRCDIR([configure.ac]) AC_PROG_AWK AC_PROG_MKDIR_P AM_INIT_AUTOMAKE([foreign]) AC_SUBST([ENABLE_KVM], []) -AC_SUBST([TRISQUEL_NETINSTALL], []) +AC_SUBST([TRISQUEL_INSTALLATION_IMAGE], []) AC_ARG_ENABLE(kvm, [AS_HELP_STRING([--disable-kvm], @@ -32,17 +33,15 @@ AC_ARG_ENABLE(kvm, AM_CONDITIONAL( [WANT_KVM], [test x"$kvm" = x"yes"]) AC_ARG_WITH( - [trisquel-netinstall], + [trisquel-installation-image], [AS_HELP_STRING( - [--with-trisquel-netinstall=PATH], - [Path to trisquel netinstall image - (default=trisquel-netinst_11.0_amd64.iso). Note that at the moment - only trisquel-netinst_11.0_amd64.iso is supported. If you use + [--with-trisquel-installation-image=PATH], + [Path to trisquel installation image + (default=trisquel_11.0_amd64.iso). Note that at the moment + only trisquel_11.0_amd64.iso is supported. If you use another image the signature verification will fail.])], - [TRISQUEL_NETINSTALL=$withval], - [TRISQUEL_NETINSTALL=trisquel-netinst_11.0_amd64.iso]) - -echo "TRISQUEL_NETINSTALL=$TRISQUEL_NETINSTALL" + [TRISQUEL_INSTALLATION_IMAGE=$withval], + [TRISQUEL_INSTALLATION_IMAGE=trisquel_11.0_amd64.iso]) AC_CHECK_PROG([CHMOD], [chmod], [chmod]) AS_IF([test x"$CHMOD" = x""], @@ -92,19 +91,22 @@ AC_CHECK_PROG([QEMU_SYSTEM_X86_64], [qemu-system-x86_64], [qemu-system-x86_64]) AS_IF([test x"$QEMU_SYSTEM_X86_64" = x""], [AC_MSG_ERROR([qemu-system-x86_64 was not found in PATH ($PATH)])]) -# Check for the netinstall iso file -AS_IF([test x"`echo "$TRISQUEL_NETINSTALL" | cut -c1`" = x"~"], - [AC_MSG_ERROR([~ not supported in --with-trisquel-netinstall. Use paths without '~'.])]) +# Check for the installation image file +AS_IF([test x"`echo "$TRISQUEL_INSTALLATION_IMAGE" | cut -c1`" = x"~"], + [AC_MSG_ERROR([~ not supported in --with-trisquel-installation-image. + Use paths without '~'.])]) -AC_CHECK_FILE([$TRISQUEL_NETINSTALL], +AC_CHECK_FILE([$TRISQUEL_INSTALLATION_IMAGE], [], - [AC_MSG_ERROR([trisquel-netinst_11.0_amd64.iso was not found in $TRISQUEL_NETINSTALL])]) + [AC_MSG_ERROR([trisquel_11.0_amd64.iso was not found in + $TRISQUEL_INSTALLATION_IMAGE])]) AS_IF([test x"$kvm" = x"yes"], [AS_IF([test -c /dev/kvm], [], AC_MSG_ERROR([/dev/kvm not found.])) AS_IF([echo quit | qemu-system-x86_64 -display none -vga none -enable-kvm -monitor stdio], [], - [AC_MSG_ERROR([KVM test with qemu-system-x86_64 failed. Check permissions on /dev/kvm.])])]) + [AC_MSG_ERROR([KVM test with qemu-system-x86_64 failed. + Check permissions on /dev/kvm.])])]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT @@ -115,4 +117,4 @@ echo "======================" AS_IF([test x"$kvm" = x"yes"], [echo "- Kvm: enabled"], [echo "- Kvm: disabled"]) -echo "- Trisquel netinstall path: $TRISQUEL_NETINSTALL" +echo "- Trisquel installation image path: $TRISQUEL_INSTALLATION_IMAGE" diff --git a/trisquel-automatic-netinstall-qemu/grub.cfg b/trisquel-automatic-netinstall-qemu/grub.cfg index 6df9e37..5862770 100644 --- a/trisquel-automatic-netinstall-qemu/grub.cfg +++ b/trisquel-automatic-netinstall-qemu/grub.cfg @@ -13,6 +13,7 @@ set timeout=1 menuentry "Trisquel 11 netinstall with custom preseed" { + set gfxpayload=keep linux /boot/linux auto=true priority=critical preseed/file=/media/preseed.cfg --- console=ttyS0,115200 quiet initrd /boot/initrd.gz } diff --git a/trisquel-automatic-netinstall-qemu/preseed.cfg b/trisquel-automatic-netinstall-qemu/preseed.cfg index 45ab2bd..cd8d384 100644 --- a/trisquel-automatic-netinstall-qemu/preseed.cfg +++ b/trisquel-automatic-netinstall-qemu/preseed.cfg @@ -27,14 +27,20 @@ d-i debian-installer/locale string en_US # Network d-i netcfg/choose_interface select auto -d-i netcfg/get_domain string test -d-i netcfg/get_hostname string test +d-i netcfg/get_domain string +d-i netcfg/get_hostname string trisquel # Package management +d-i mirror/protocol select cdrom +d-i cdrom-detect/cdrom_fs string iso9660 +d-i apt-setup/cdrom/set-first boolean true +d-i apt-setup/cdrom/set-next boolean true +d-i apt-setup/no_mirror boolean true d-i mirror/country string manual d-i mirror/http/directory string /trisquel d-i mirror/http/hostname string mirror.fsf.org d-i mirror/http/proxy string +# Trisquel 11.0 _aramo_ - Release amd64 (20230315) popularity-contest popularity-contest/participate boolean false # Partitioning diff --git a/trisquel-automatic-netinstall-qemu/trisquel-netinst_11.0_amd64.iso.asc b/trisquel-automatic-netinstall-qemu/trisquel-netinst_11.0_amd64.iso.asc deleted file mode 100644 index d3e36cf..0000000 --- a/trisquel-automatic-netinstall-qemu/trisquel-netinst_11.0_amd64.iso.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE0k3aySJtW6Xp877T9dqq90rUyTgFAmQWV7cACgkQ9dqq90rU -yTg2Lw//Y6z8D0uKRl2ihiDqBWWaV1Q7urck/HcLYDYyfbemlLCm3lt3K9lU/CGS -Sa4viGLnfC9sXwBvDAAOHQI9zmlV5QmJtYzUv/oAT929qsIXFWRT4JerMdcpf/KK -i/DkQyu8VbgZbRMJihozTuArlCLmIBFjskTw0gQcl4okiaasrYFGCw0uLVFGInkD -2iiTgoi0EzuLEoJtITELUOuZRDbFwz/5Wn0lC0oDxVx9vH4keBz2RlyVtQmAhrKQ -Xt278M6E8N4vE8/euIYSTlRFfifLux9RLvq1sUXNc0fluU7D7ndqtWVO3fMCRu5M -q5Hd61K8HAlT3xO58VTsekvId1An0g/tGrRVle2Ny3jcPb4zpoGwD2bZbKvgSEZW -UMaDBLAvfUvzGEv8zU8j318ClBPcQUMzCISdbCaK/0GhszcxC4+RGPOum7vCHB4V -jbvkrjnGnfPam6p+KBDuYuYx9qYqMtJm3l0rsijThljBmBPTDqvpaAvfrk0sOxyD -PnqTSU35OVJCZWtQD4M855vxN0Y44BTVleklW6iS/56Jn29bVHofu/evZxFkNboe -USQELjuyRpAMQPUvkPlRYqrKMmgrV95GMEBWiPJz/7qOv7kMahSoHoOkAP6XtJjz -IW0eZ1wijG7pQRgpEZ3OQKNI9KFV0nzGNqbHI8ymtHvzQsTCSP8= -=/+sf ------END PGP SIGNATURE----- diff --git a/trisquel-automatic-netinstall-qemu/trisquel_11.0_amd64.iso.asc b/trisquel-automatic-netinstall-qemu/trisquel_11.0_amd64.iso.asc new file mode 100644 index 0000000..7a678c7 --- /dev/null +++ b/trisquel-automatic-netinstall-qemu/trisquel_11.0_amd64.iso.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE0k3aySJtW6Xp877T9dqq90rUyTgFAmQWWFoACgkQ9dqq90rU +yTjFWw//Q6bQK1VST9Jy5JvP1mQDUoGl879ep4S4ME5uPxs+4xqDeXb425YSLsYT +A7+Uz0jG9RZYmL/0cQDUlpWuD4j03mE+1EUdyHWrzK2n47aNrXrktPiiua+lxJiA +2w7lP9/4BTfpNRGkdiilz1k5/BeiucsFnxWuurxYbkVLWVFv8HOIJDkdeA6sAVWK +6cIxAzluWQYW7jqiaeEG70yRfIgGn8OxZCqXVea4K1LpOQtRf5WyznbYGKP6Ry4P +dJixpckvFccqsnd/Fm5j3/g3+E551IodjdedgMBkREe9PDeujkfgQlGCBIwi8nBE +j0HnadT8I6IZ5197NTPuKU8ewNx6DZFOq9WXvot9koE+uzk+nHIn76kpXBOilx8k +U66W/7fspCC9cRrZLkAJSxuHwrk7W7pPtyr4EmGmtzRN6Opu/v6yUAIyW0P051GQ +XwMBjuQmvxYEI3EIxwdHh2JiXQz5vJo2I0DVpe6hklKncoAzmR2PTP80N9SG0dnt +ziH/BRklqgeCnfw/bd4zV/Zbb6nFLituuRLjTD4vtR1Kni4iBFZT1M+06OqzSIqc +RulpU+PikktvgFdFDzkFXRkyMF1IAAbKm1L0q5ANI+3f4Hw7NZEax+wwW1Si1Z1g +pemXYxML1L7V4SEdLHiukQLGIXx7YVLM89u2lqW9nj/nUXbigD4= +=PM9N +-----END PGP SIGNATURE-----