diff options
| author | Adriaan de Groot <groot@kde.org> | 2019-05-10 15:35:00 -0400 |
|---|---|---|
| committer | Adriaan de Groot <groot@kde.org> | 2019-05-10 15:35:00 -0400 |
| commit | 23ae6b77bdfff6331cbbd1b4fd483fde73ac51f0 (patch) | |
| tree | bbc4b0892ece8b51341a3d44c2a40972b6fc0dd0 | |
| parent | 9bf1d83c2f58f24cbaef3a6820fbe3b79f3246f8 (diff) | |
[bootloader] Convert to str
- The output of subprocess is a bytes object, which needs to
be decoded so we can use it like a regular string (alternatively,
we could have changed more code to manipulate bytes, but eventually
we need a string to pass to a subsequent command anyway).
| -rw-r--r-- | src/modules/bootloader/main.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py index 2c384ca30..f69cf8aa3 100644 --- a/src/modules/bootloader/main.py +++ b/src/modules/bootloader/main.py @@ -366,10 +366,10 @@ def install_secureboot(efi_directory): # of that tuple. efi_drive = subprocess.check_output([ libcalamares.job.configuration["grubProbe"], - "-t", "drive", "--device-map=", install_efi_directory]) + "-t", "drive", "--device-map=", install_efi_directory]).decode("ascii") efi_disk = subprocess.check_output([ libcalamares.job.configuration["grubProbe"], - "-t", "disk", "--device-map=", install_efi_directory]) + "-t", "disk", "--device-map=", install_efi_directory]).decode("ascii") efi_drive_partition = efi_drive.replace("(","").replace(")","").split(",")[1] # Get the first run of digits from the partition |