From b7e005bbc1c9b6891896a489f3a433911b3077dc Mon Sep 17 00:00:00 2001 From: Erwann Roussy Date: Fri, 12 Dec 2025 11:03:53 +0100 Subject: [PATCH 1/3] rawimage: correct bug when listing volume groups Multiple volume groups can be already present on the machine, but previous code only handled one. Correct this bug by iterating within the volume group list Also check that the volume group is part of the disk we are targeting to avoid removing volume groups from other disks. Signed-off-by: Erwann Roussy --- src/modules/rawimage/main.py | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/modules/rawimage/main.py b/src/modules/rawimage/main.py index 1f2ad6a..1d112f5 100644 --- a/src/modules/rawimage/main.py +++ b/src/modules/rawimage/main.py @@ -172,20 +172,32 @@ def remove_volume_group(mount_point): ) except subprocess.CalledProcessError: # Volume group does not exist; nothing to do - libcalamares.utils.error(f"Failed to list volume group on: {mount_point}") + libcalamares.utils.error("Failed to list volume groups") raise - vg_name = vg.stdout.strip() + for element in vg.stdout.split('\n'): + vg_name=element.strip() + if vg_name == "": + continue - if vg_name != "": try: - subprocess.run( - ["/usr/sbin/vgremove", "-y", vg_name], check=True + pv_name = subprocess.run( + ["vgs", "--noheadings", "-o", "pv_name", vg_name], check=True, capture_output=True, text=True ) except subprocess.CalledProcessError: - libcalamares.utils.warning(f"Failed to disable volume group on: {mount_point}") + libcalamares.utils.error("Failed to list physical volume names") raise + # Check if volume group concerns the targeted disk + if mount_point in pv_name.stdout.strip(): + try: + subprocess.run( + ["/usr/sbin/vgremove", "-y", vg_name], check=True + ) + except subprocess.CalledProcessError: + libcalamares.utils.warning(f"Failed to disable volume group on: {mount_point}") + raise + def run(): """Raw image copy module""" From 28aa4daa519be5200495e8ae273b10f330ccc416 Mon Sep 17 00:00:00 2001 From: Erwann Roussy Date: Fri, 12 Dec 2025 11:10:07 +0100 Subject: [PATCH 2/3] .cqfdrc: rename sfl_ci to ci Signed-off-by: Erwann Roussy --- .cqfdrc | 4 ++-- .github/workflows/ci-seapath-installer.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.cqfdrc b/.cqfdrc index 18b6dd3..83939a3 100644 --- a/.cqfdrc +++ b/.cqfdrc @@ -4,7 +4,7 @@ name='seapath-installer' [build] command='./build.sh' -flavors='sfl_ci' +flavors='ci' -[sfl_ci] +[ci] command='./build.sh' diff --git a/.github/workflows/ci-seapath-installer.yml b/.github/workflows/ci-seapath-installer.yml index 970c619..f0a9423 100644 --- a/.github/workflows/ci-seapath-installer.yml +++ b/.github/workflows/ci-seapath-installer.yml @@ -38,4 +38,4 @@ jobs: cqfd init - name: Build seapath-installer run: | - cqfd -b sfl_ci + cqfd -b ci From 72e98f89b7d4897e10880e36183482a171fc1456 Mon Sep 17 00:00:00 2001 From: Erwann Roussy Date: Fri, 12 Dec 2025 14:58:16 +0100 Subject: [PATCH 3/3] README.md: Add multiple vg bug correction to v1.2.1 Signed-off-by: Erwann Roussy --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 91030ea..2921828 100644 --- a/README.md +++ b/README.md @@ -168,6 +168,7 @@ https://calamares.euroquis.nl/ # Release notes ## Version 1.2.1 * Fix segfault when no partitions are on the selected disk +* Fix error when multiple lvm volume group are present on the machine ## Version 1.2.0 * Fix slideshow image display