Merge pull request #317 from insanemal/torxed-v2.2.0
In guided install Non-UEFI installs need to use grub-install
This commit is contained in:
commit
636a7b95d5
|
|
@ -278,6 +278,7 @@ class Installer():
|
||||||
## (encrypted partitions default to btrfs for now, so we need btrfs-progs)
|
## (encrypted partitions default to btrfs for now, so we need btrfs-progs)
|
||||||
## TODO: Perhaps this should be living in the function which dictates
|
## TODO: Perhaps this should be living in the function which dictates
|
||||||
## the partitioning. Leaving here for now.
|
## the partitioning. Leaving here for now.
|
||||||
|
|
||||||
MODULES = []
|
MODULES = []
|
||||||
BINARIES = []
|
BINARIES = []
|
||||||
FILES = []
|
FILES = []
|
||||||
|
|
@ -303,6 +304,9 @@ class Installer():
|
||||||
if 'encrypt' not in HOOKS:
|
if 'encrypt' not in HOOKS:
|
||||||
HOOKS.insert(HOOKS.index('filesystems'), 'encrypt')
|
HOOKS.insert(HOOKS.index('filesystems'), 'encrypt')
|
||||||
|
|
||||||
|
if not(hasUEFI()): # TODO: Allow for grub even on EFI
|
||||||
|
self.base_packages.append('grub')
|
||||||
|
|
||||||
self.pacstrap(self.base_packages)
|
self.pacstrap(self.base_packages)
|
||||||
self.helper_flags['base-strapped'] = True
|
self.helper_flags['base-strapped'] = True
|
||||||
#self.genfstab()
|
#self.genfstab()
|
||||||
|
|
|
||||||
|
|
@ -373,4 +373,3 @@ def perform_installation(mountpoint):
|
||||||
|
|
||||||
ask_user_questions()
|
ask_user_questions()
|
||||||
perform_installation_steps()
|
perform_installation_steps()
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue