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

[grub] replace chroot_call with check_chroot_call

Browse Source
This commit is contained in:
Philip 2015-02-14 10:47:05 +01:00
parent fb8483ce99
commit 75857971c4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/grub/main.py
View File

@ -28,7 +28,7 @@ def install_grub(boot_loader, fw_type):
if fw_type == 'efi': if fw_type == 'efi':
efi_directory = libcalamares.job.configuration["efiDirectory"] efi_directory = libcalamares.job.configuration["efiDirectory"]
efi_directory_firmware = libcalamares.job.configuration["efiDirectoryFirmware"] efi_directory_firmware = libcalamares.job.configuration["efiDirectoryFirmware"]
chroot_call(["mkdir", "-p", "{!s}".format(efi_directory)]) check_chroot_call(["mkdir", "-p", "{!s}".format(efi_directory)])
if "efiBootloaderId" in libcalamares.job.configuration: if "efiBootloaderId" in libcalamares.job.configuration:
efi_bootloader_id = libcalamares.job.configuration["efiBootloaderId"] efi_bootloader_id = libcalamares.job.configuration["efiBootloaderId"]
else: else:
@ -38,8 +38,8 @@ def install_grub(boot_loader, fw_type):
efi_bootloader_id = distribution.translate(file_name_sanitizer) efi_bootloader_id = distribution.translate(file_name_sanitizer)
check_chroot_call([libcalamares.job.configuration["grubInstall"], "--target=x86_64-efi", "--efi-directory={!s}".format(efi_directory), "--bootloader-id={!s}".format(efi_bootloader_id)]) check_chroot_call([libcalamares.job.configuration["grubInstall"], "--target=x86_64-efi", "--efi-directory={!s}".format(efi_directory), "--bootloader-id={!s}".format(efi_bootloader_id)])
# Workaround for some UEFI firmwares # Workaround for some UEFI firmwares
chroot_call(["mkdir", "-p", "{!s}/boot".format(efi_directory_firmware)]) check_chroot_call(["mkdir", "-p", "{!s}/boot".format(efi_directory_firmware)])
chroot_call(["cp", "{!s}/{!s}/grubx64.efi".format(efi_directory_firmware,efi_bootloader_id), "{!s}/boot/bootx64.efi".format(efi_directory_firmware)]) check_chroot_call(["cp", "{!s}/{!s}/grubx64.efi".format(efi_directory_firmware,efi_bootloader_id), "{!s}/boot/bootx64.efi".format(efi_directory_firmware)])
else: else:
install_path = boot_loader["installPath"] install_path = boot_loader["installPath"]
check_chroot_call([libcalamares.job.configuration["grubInstall"], "--target=i386-pc", install_path]) check_chroot_call([libcalamares.job.configuration["grubInstall"], "--target=i386-pc", install_path])