use curtin.block.partition_kname to calculate partition devpath

hopefully fixing https://bugs.launchpad.net/subiquity/+bug/1861369
This commit is contained in:
Michael Hudson-Doyle 2020-04-15 14:17:29 +12:00
parent 32dcd15cd8
commit 1c378b9958
1 changed files with 4 additions and 2 deletions

View File

@ -25,8 +25,9 @@ import os
import pathlib
import platform
from curtin.util import human2bytes
from curtin.block import partition_kname
from curtin import storage_config
from curtin.util import human2bytes
from probert.storage import StorageInfo
@ -1533,7 +1534,8 @@ class FilesystemModel(object):
if self.grub_install_device:
dev = self.grub_install_device
if dev.type == "partition":
devpath = "{}{}".format(dev.device.path, dev._number)
disk_kname = dev.device.path[5:] # chop off "/dev/"
devpath = "/dev/" + partition_kname(disk_kname, dev._number)
else:
devpath = dev.path
config['grub'] = {