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

[partition] change efiPartition value to /boot

Browse Source 
- we need to make it configurable not hard-coded
- some distributions need '/boot/efi' or '/boot/EFI', some work with '/boot'
This commit is contained in:
Philip 2015-02-14 13:06:05 +01:00
parent 75857971c4
commit 1f661a8b4b
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/modules/grub/grub.conf
View File

@ -5,6 +5,7 @@ grubInstall: "grub-install"
grubMkconfig: "grub-mkconfig" grubMkconfig: "grub-mkconfig"
grubCfg: "/boot/grub/grub.cfg" grubCfg: "/boot/grub/grub.cfg"
# Some distributions require a /boot/efi or /boot/EFI directory. Configure as needed. # Some distributions require a /boot/efi or /boot/EFI directory. Configure as needed.
# These values need to be in-sync with partition.conf
efiDirectory: "/boot" efiDirectory: "/boot"
efiDirectoryFirmware: "/boot/EFI" efiDirectoryFirmware: "/boot/EFI"
# Optionally set the --bootloader-id to use for EFI. If not set, this defaults # Optionally set the --bootloader-id to use for EFI. If not set, this defaults

2
src/modules/partition/gui/EraseDiskPage.cpp
View File

@ -160,7 +160,7 @@ EraseDiskPage::doAutopartition( Device* dev )
first_free_sector, first_free_sector,
lastSector lastSector
); );
PartitionInfo::setMountPoint( efiPartition, "/boot/efi" ); PartitionInfo::setMountPoint( efiPartition, "/boot" );
PartitionInfo::setFormat( efiPartition, true ); PartitionInfo::setFormat( efiPartition, true );
m_core->createPartition( dev, efiPartition ); m_core->createPartition( dev, efiPartition );
first_free_sector = lastSector + 1; first_free_sector = lastSector + 1;

5
src/modules/partition/partition.conf Normal file
View File

@ -0,0 +1,5 @@
---
# Some distributions require a /boot/efi or /boot/EFI directory. Configure as needed.
# These values need to be in-sync with grub.conf
efiDirectory: "/boot"
efiDirectoryFirmware: "/boot/EFI"