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

[bootloader] Modifications

Browse Source 
- move fail-check out of loop
- add more debug lines
This commit is contained in:
Philip 2015-02-22 18:06:15 +01:00
parent fe7c5bbe77
commit 9ac0fc37b1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -185,7 +185,7 @@ def prepare_bootloader(fw_type):
print("EFI directory: \"{!s}\"".format(efi_directory)) print("EFI directory: \"{!s}\"".format(efi_directory))
print("Boot partition: \"{!s}\"".format(boot_p)) print("Boot partition: \"{!s}\"".format(boot_p))
print("Boot device: \"{!s}\"".format(device)) print("Boot device: \"{!s}\"".format(device))
print("Set EF00 flag") print("Set 'EF00' flag")
subprocess.call(["sgdisk", "--typecode={!s}:EF00".format(boot_p), "{!s}".format(device)]) subprocess.call(["sgdisk", "--typecode={!s}:EF00".format(boot_p), "{!s}".format(device)])
if fw_type != "efi": if fw_type != "efi":
partitions = libcalamares.globalstorage.value("partitions") partitions = libcalamares.globalstorage.value("partitions")
@ -210,11 +210,11 @@ def prepare_bootloader(fw_type):
return ("Boot partition not found!", return ("Boot partition not found!",
"Partition: \"{!s}\"", "Partition: \"{!s}\"",
"Device: \"{!s}\"".format(boot_p,device)) "Device: \"{!s}\"".format(boot_p,device))
process = subprocess.Popen(["parted", "{!s}".format(device), process = subprocess.Popen(["parted", "{!s}".format(device),
"--list"], stdout=subprocess.PIPE) "--list"], stdout=subprocess.PIPE)
for line in process.stdout: for line in process.stdout:
if b"gpt" in line: if b"gpt" in line:
print("Set 'bios_grub' flag")
subprocess.call(["parted", "{!s}".format(device), subprocess.call(["parted", "{!s}".format(device),
"set {!s} bios_grub on".format(boot_p)]) "set {!s} bios_grub on".format(boot_p)])
if (efi_boot_loader == "gummiboot" and fw_type == "efi"): if (efi_boot_loader == "gummiboot" and fw_type == "efi"):