napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[bootloader] if boot_p or device is empty, break and throw an error

Browse Source
This commit is contained in:
Philip 2015-02-19 19:09:13 +01:00
parent 97878ad1c6
commit 715112261d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/bootloader/main.py
View File

@ -137,13 +137,17 @@ def install_bootloader(boot_loader, fw_type):
loader_path = os.path.join(
install_efi_directory, "loader", "loader.conf")
partitions = libcalamares.globalstorage.value("partitions")
boot_p = ""
device = ""
for partition in partitions:
if partition["mountPoint"] == efi_directory:
print(partition["device"])
boot_device = partition["device"]
boot_p = boot_device[-1:]
device = boot_device[:-1]
print(device)
if (boot_p == "" or device == ""):
return ("EFI directory \"{!s}\" not found!",
"Boot partition: \"{!s}\"",
"Device: \"{!s}\"".format(efi_directory,boot_p,device))
subprocess.call(["sgdisk", "--typecode={!s}:EF00".format(boot_p), "{!s}".format(device)])
subprocess.call(["gummiboot", "--path={!s}".format(install_efi_directory), "install"])
create_conf(uuid, conf_path)