applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-29 02:15:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[PEP 8] General Style Part 3

Browse source
This commit is contained in:
Gormogon 2015-02-18 10:03:57 -05:00
parent 09dc6bb5d7
commit 5c1ee7bbcb
6 changed files with 80 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/modules/bootloader/main.py
View file

@ -50,6 +50,7 @@ def get_bootloader_entry_name():
branding = libcalamares.globalstorage.value("branding")
return branding["bootloaderEntryName"]
def create_conf(uuid, conf_path):
distribution = get_bootloader_entry_name()
kernel = libcalamares.job.configuration["kernel"]
@ -128,9 +129,11 @@ def install_bootloader(boot_loader, fw_type):
file_name_sanitizer = str.maketrans(" /", "_-")
distribution_translated = distribution.translate(file_name_sanitizer)
conf_path = os.path.join(
install_efi_directory, "loader", "entries", "{!s}.conf".format(distribution_translated))
install_efi_directory, "loader", "entries",
"{!s}.conf".format(distribution_translated))
fallback_path = os.path.join(
install_efi_directory, "loader", "entries", "{!s}-fallback.conf".format(distribution_translated))
install_efi_directory, "loader", "entries",
"{!s}-fallback.conf".format(distribution_translated))
loader_path = os.path.join(
install_efi_directory, "loader", "loader.conf")
partitions = libcalamares.globalstorage.value("partitions")
@ -142,17 +145,17 @@ def install_bootloader(boot_loader, fw_type):
device = boot_device[:-1]
print(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_fallback(uuid, fallback_path)
create_loader(loader_path)
else:
install_path = boot_loader["installPath"]
check_chroot_call(
[libcalamares.job.configuration["grubInstall"], "--target=i386-pc", install_path])
check_chroot_call([libcalamares.job.configuration[
"grubMkconfig"], "-o", libcalamares.job.configuration["grubCfg"]])
[libcalamares.job.configuration["grubInstall"], "--target=i386-pc",
install_path])
check_chroot_call([libcalamares.job.configuration["grubMkconfig"], "-o",
libcalamares.job.configuration["grubCfg"]])
def run():