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

[bootloader] print() does not log

Browse Source 
- use the right logging method; print just vanishes.
This commit is contained in:
Adriaan de Groot 2018-01-30 11:26:29 +01:00
parent f869a0f263
commit 533031b3ca
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,13 +44,11 @@ def get_uuid():
:return: :return:
""" """
root_mount_point = libcalamares.globalstorage.value("rootMountPoint") root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
print("Root mount point: \"{!s}\"".format(root_mount_point))
partitions = libcalamares.globalstorage.value("partitions") partitions = libcalamares.globalstorage.value("partitions")
print("Partitions: \"{!s}\"".format(partitions))
for partition in partitions: for partition in partitions:
if partition["mountPoint"] == "/": if partition["mountPoint"] == "/":
print("Root partition uuid: \"{!s}\"".format(partition["uuid"])) libcalamares.utils.debug("Root partition uuid: \"{!s}\"".format(partition["uuid"]))
return partition["uuid"] return partition["uuid"]
return "" return ""
@ -175,7 +173,7 @@ def install_systemd_boot(efi_directory):
:param efi_directory: :param efi_directory:
""" """
print("Bootloader: systemd-boot") libcalamares.utils.debug("Bootloader: systemd-boot")
install_path = libcalamares.globalstorage.value("rootMountPoint") install_path = libcalamares.globalstorage.value("rootMountPoint")
install_efi_directory = install_path + efi_directory install_efi_directory = install_path + efi_directory
uuid = get_uuid() uuid = get_uuid()
@ -197,10 +195,10 @@ def install_systemd_boot(efi_directory):
"--path={!s}".format(install_efi_directory), "--path={!s}".format(install_efi_directory),
"install"]) "install"])
kernel_line = get_kernel_line("default") kernel_line = get_kernel_line("default")
print("Configure: \"{!s}\"".format(kernel_line)) libcalamares.utils.debug("Configure: \"{!s}\"".format(kernel_line))
create_systemd_boot_conf(uuid, conf_path, kernel_line) create_systemd_boot_conf(uuid, conf_path, kernel_line)
kernel_line = get_kernel_line("fallback") kernel_line = get_kernel_line("fallback")
print("Configure: \"{!s}\"".format(kernel_line)) libcalamares.utils.debug("Configure: \"{!s}\"".format(kernel_line))
create_systemd_boot_conf(uuid, fallback_path, kernel_line) create_systemd_boot_conf(uuid, fallback_path, kernel_line)
create_loader(loader_path) create_loader(loader_path)
@ -213,7 +211,7 @@ def install_grub(efi_directory, fw_type):
:param fw_type: :param fw_type:
""" """
if fw_type == "efi": if fw_type == "efi":
print("Bootloader: grub (efi)") libcalamares.utils.debug("Bootloader: grub (efi)")
install_path = libcalamares.globalstorage.value("rootMountPoint") install_path = libcalamares.globalstorage.value("rootMountPoint")
install_efi_directory = install_path + efi_directory install_efi_directory = install_path + efi_directory
@ -281,7 +279,7 @@ def install_grub(efi_directory, fw_type):
shutil.copy2(efi_file_source, efi_file_target) shutil.copy2(efi_file_source, efi_file_target)
else: else:
print("Bootloader: grub (bios)") libcalamares.utils.debug("Bootloader: grub (bios)")
if libcalamares.globalstorage.value("bootLoader") is None: if libcalamares.globalstorage.value("bootLoader") is None:
return return