[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 3/7] packages: roms: tests: Fix Trisquel LVM test.
From: |
Denis 'GNUtoo' Carikli |
Subject: |
[PATCH v1 3/7] packages: roms: tests: Fix Trisquel LVM test. |
Date: |
Thu, 19 Dec 2024 00:17:11 +0100 |
This was broken from the start in the commit
9cc02ddde1e164fabfbddc8bbd3832ef9468d92d ("packages: roms: Start
adding automatic tests.").
I vaguely remember having made the original tests with Trisquel 10,
and if we select LVM in Trisquel 10 both in the graphical and
netinstall installers, it ends up creating a BIOS boot partition (code
ef02), an UEFI partition (code ef00) in the case of the graphical
installer, and an LVM physical volume. I then migrated the automatic
test to Trisquel 11 before sending the patch.
But with the commit 9cc02ddde1e164fabfbddc8bbd3832ef9468d92d
("packages: roms: Start adding automatic tests."), we end up with a
rootfs that has a /boot partition, so GRUB will find that and use it
to boot, without testing if GRUB can find the grub.cfg inside the LVM
partition.
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
---
resources/trisquel/preseed.cfg | 36 ++++++++++++++++++++++++++-
resources/trisquel/preseed.img.sha512 | 2 +-
2 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/resources/trisquel/preseed.cfg b/resources/trisquel/preseed.cfg
index e7c3682b..fbe127f5 100644
--- a/resources/trisquel/preseed.cfg
+++ b/resources/trisquel/preseed.cfg
@@ -21,6 +21,12 @@ d-i passwd/user-fullname string
gnuboot
d-i passwd/user-password password password
d-i passwd/user-password-again password password
+##############
+# Bootloader #
+##############
+# we need to generate a GRUB configuration.
+d-i grub-installer/bootdev string /dev/vda
+
###################
# Keyboard layout #
###################
@@ -50,7 +56,14 @@ popularity-contest popularity-contest/participate boolean
false
################
# Partitioning #
################
-d-i grub-installer/bootdev string /dev/vda
+
+# Documentation:
+# - /var/lib/cdebconf/templates.dat inside the netinstall.
+# - doc/devel/partman-auto-recipe.txt inisde the debian-installer source code
+# (apt-source debian-installer).
+
+d-i partman-auto-lvm/no_boot boolean true
+d-i partman-auto-lvm/new_vg_name string vg
d-i partman-auto-lvm/guided_size string max
d-i partman-auto/choose_recipe select atomic
d-i partman-auto/disk string /dev/vda
@@ -67,6 +80,27 @@ d-i partman/confirm boolean
true
d-i partman/confirm_nooverwrite boolean true
d-i partman/confirm_nooverwrite boolean true
+# For an unknown reason, with no swap and the "d-i
+# partman-basicfilesystems/no_swap boolean true" setting, the
+# installer blocks. The partman/early_command below based on an
+# example in doc/devel/partman-auto-recipe.txt
+d-i partman/early_command string \
+ debconf-set partman-auto/expert_recipe "boot-root :: \
+ 1 10000 -1 ext4 \
+ \$primary{ } \
+ \$bootable{ } \
+ method{ lvm } \
+ \$lvmok{ } \
+ lv_name{ root } \
+ format{ } \
+ use_filesystem{ } \
+ filesystem{ ext4 } \
+ mountpoint{ / } . \
+ 1 512 100% linux-swap \
+ method{ swap } \
+ format{ } . \
+ ";
+
#################################
# Automatically shutdown the VM #
#################################
diff --git a/resources/trisquel/preseed.img.sha512
b/resources/trisquel/preseed.img.sha512
index 8d83ac0f..c0637fe1 100644
--- a/resources/trisquel/preseed.img.sha512
+++ b/resources/trisquel/preseed.img.sha512
@@ -1 +1 @@
-d3dc630d1b3971a2f859ec2c72e1bc7b7ab59ea7c3932735868c9709567d58f9e7b4bd1af4ccb1e4f2931f974757cccb4ec2804baa446d540904de0cbf567a48
preseed.img
+b32a112477d148a700574b781df0a4217c1824bacf55e78e7364c619a3dce802b90dc3beb76c51a99410a8167f289bb53e1e9a6a70a46c6ef02de73c33668683
preseed.img
--
2.46.0
- [PATCH v1 0/7] Fix for the LVM2 test + website improvements., Denis 'GNUtoo' Carikli, 2024/12/18
- [PATCH v1 4/7] website: status: 0.1 RC5: set ThinkPad T500 as tested., Denis 'GNUtoo' Carikli, 2024/12/18
- [PATCH v1 5/7] website: status: 0.1 RC5: set ThinkPad R400 as tested., Denis 'GNUtoo' Carikli, 2024/12/18
- [PATCH v1 6/7] website: status: tables: fix uncomplete columns., Denis 'GNUtoo' Carikli, 2024/12/18
- [PATCH v1 7/7] website: status: tables: workaround lack of colspan., Denis 'GNUtoo' Carikli, 2024/12/18
- [PATCH v1 3/7] packages: roms: tests: Fix Trisquel LVM test.,
Denis 'GNUtoo' Carikli <=
- [PATCH v1 1/7] packages: roms: download: help: add missing rootfs.img., Denis 'GNUtoo' Carikli, 2024/12/18
- [PATCH v1 2/7] packages: roms: download: fix preseed.img argument., Denis 'GNUtoo' Carikli, 2024/12/18
- Re: [PATCH v1 0/7] Fix for the LVM2 test + website improvements., Denis 'GNUtoo' Carikli, 2024/12/20