adding localecfg

locale hardcoded to en_US until local globalstorage is available
run pep8 on bootloader main.py, plain switch from subprocess to chroot_call fails for gummiboot call
This commit is contained in:
demmm 2014-11-12 23:10:20 -05:00
parent df200f2210
commit ff1383d7f5
3 changed files with 74 additions and 3 deletions

View file

@ -35,7 +35,7 @@ def detect_firmware_type():
fw_type = 'efi'
else:
fw_type = 'bios'
libcalamares.globalstorage.insert("firmwareType", fw_type)
libcalamares.utils.debug("Firmware type: {!s}".format(fw_type))
@ -51,6 +51,7 @@ def get_uuid():
return partition["uuid"]
return ""
def create_conf(uuid, conf_path):
distribution = libcalamares.job.configuration["distribution"]
kernel = libcalamares.job.configuration["kernel"]
@ -76,6 +77,7 @@ def create_conf(uuid, conf_path):
f.write(l)
f.close()
def create_fallback(uuid, fallback_path):
distribution = libcalamares.job.configuration["distribution"]
kernel = libcalamares.job.configuration["kernel"]
@ -143,8 +145,10 @@ def install_bootloader(boot_loader, fw_type):
create_loader(loader_path)
else:
install_path = boot_loader["installPath"]
check_chroot_call([libcalamares.job.configuration["grubInstall"], install_path])
check_chroot_call([libcalamares.job.configuration["grubMkconfig"], "-o", libcalamares.job.configuration["grubCfg"]])
check_chroot_call(
[libcalamares.job.configuration["grubInstall"], install_path])
check_chroot_call([libcalamares.job.configuration[
"grubMkconfig"], "-o", libcalamares.job.configuration["grubCfg"]])
def run():