From 9ed9f4e469be93aa99fd4b09031ce3395a01c3e5 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 9 Jun 2023 14:29:54 +1200 Subject: [PATCH] update curtin and adapt to API change --- snapcraft.yaml | 2 +- subiquity/server/controllers/filesystem.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index c2d3f21e..814040c6 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -61,7 +61,7 @@ parts: source: https://git.launchpad.net/curtin source-type: git - source-commit: 8e74f621e1bd84f804bda280a370440b150f9f40 + source-commit: 6412598919202072d0d8b57827a120c963478d35 override-pull: | craftctl default diff --git a/subiquity/server/controllers/filesystem.py b/subiquity/server/controllers/filesystem.py index 9656decc..21fed92c 100644 --- a/subiquity/server/controllers/filesystem.py +++ b/subiquity/server/controllers/filesystem.py @@ -27,7 +27,7 @@ from typing import Any, Dict, List, Optional, Set import attr from curtin.commands.extract import AbstractSourceHandler -from curtin.storage_config import ptable_uuid_to_flag_entry +from curtin.storage_config import ptable_part_type_to_flag import pyudev @@ -673,7 +673,7 @@ class FilesystemController(SubiquityController, FilesystemManipulator): type_uuid = structure.gpt_part_type_uuid() if type_uuid: part.partition_type = type_uuid - part.flag = ptable_uuid_to_flag_entry(type_uuid)[0] + part.flag = ptable_part_type_to_flag(type_uuid) if structure.name: part.partition_name = structure.name if structure.filesystem: