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

[bootloader] add meaningful debug lines

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

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

@ -33,12 +33,12 @@ from libcalamares.utils import check_chroot_call
def get_uuid(): def get_uuid():
root_mount_point = libcalamares.globalstorage.value("rootMountPoint") root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
print(root_mount_point) print("Root mount point: \"{!s}\"".format(root_mount_point))
partitions = libcalamares.globalstorage.value("partitions") partitions = libcalamares.globalstorage.value("partitions")
print(partitions) print("Partitions: \"{!s}\"".format(partitions))
for partition in partitions: for partition in partitions:
if partition["mountPoint"] == "/": if partition["mountPoint"] == "/":
print(partition["uuid"]) print("Root partition uuid: \"{!s}\"".format(partition["uuid"]))
return partition["uuid"] return partition["uuid"]
return "" return ""
@ -147,7 +147,11 @@ def install_bootloader(boot_loader, fw_type):
if (boot_p == "" or device == ""): if (boot_p == "" or device == ""):
return ("EFI directory \"{!s}\" not found!", return ("EFI directory \"{!s}\" not found!",
"Boot partition: \"{!s}\"", "Boot partition: \"{!s}\"",
"Device: \"{!s}\"".format(efi_directory,boot_p,device)) "Boot device: \"{!s}\"".format(efi_directory,boot_p,device))
else:
print("EFI directory: \"{!s}\"".format(efi_directory))
print("Boot partition: \"{!s}\"".format(boot_p))
print("Boot device: \"{!s}\"".format(device))
subprocess.call(["sgdisk", "--typecode={!s}:EF00".format(boot_p), "{!s}".format(device)]) subprocess.call(["sgdisk", "--typecode={!s}:EF00".format(boot_p), "{!s}".format(device)])
subprocess.call(["gummiboot", "--path={!s}".format(install_efi_directory), "install"]) subprocess.call(["gummiboot", "--path={!s}".format(install_efi_directory), "install"])
create_conf(uuid, conf_path) create_conf(uuid, conf_path)