Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .cqfdrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name='seapath-installer'

[build]
command='./build.sh'
flavors='sfl_ci'
flavors='ci'

[sfl_ci]
[ci]
command='./build.sh'
2 changes: 1 addition & 1 deletion .github/workflows/ci-seapath-installer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ jobs:
cqfd init
- name: Build seapath-installer
run: |
cqfd -b sfl_ci
cqfd -b ci
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 18 additions & 6 deletions src/modules/rawimage/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"""
Expand Down