adding new bootloader job

options are to use grub for BIOS, gummiboot for efi
set extra mountpoint when efi is found

src/modules/bootloader/bootloader.conf

@@ -0,0 +1,8 @@
+---
+# Gummiboot configuration files settings, set preffered distribution name and amount of time before 
+# default selection boots
+distribution: KaOS
+
+timeout: 10
+    
+

src/modules/bootloader/main.py

@@ -0,0 +1,102 @@
+#!/usr/bin/env python3
+# encoding: utf-8
+# === This file is part of Calamares - <http://github.com/calamares> ===
+#
+#   Copyright 2014, Aurélien Gâteau <agateau@kde.org>
+#   Copyright 2014, Anke Boersma <demm@kaosx.us>
+#   Copyright 2014, Daniel Hillenbrand <codeworkx@bbqlinux.org>
+#   Copyright 2014, Benjamin Vaudour <benjamin.vaudour@yahoo.fr>
+#
+#   Calamares is free software: you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation, either version 3 of the License, or
+#   (at your option) any later version.
+#
+#   Calamares is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with Calamares. If not, see <http://www.gnu.org/licenses/>.
+
+import libcalamares
+
+import os
+import shutil
+import subprocess
+
+from libcalamares.utils import check_chroot_call
+
+def detect_firmware_type():
+    # Check for EFI variables support
+    if(os.path.exists("/sys/firmware/efi/efivars")):
+        fw_type = 'efi'
+    else:
+        fw_type = 'bios'
+
+    libcalamares.globalstorage.insert("firmwareType", fw_type)
+    libcalamares.utils.debug("Firmware type: {!s}".format(fw_type))
+
+def get_uuid():
+    root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
+    print(root_mount_point)
+    partitions = libcalamares.globalstorage.value("partitions")
+    print(partitions)
+    for partition in partitions:
+        if partition["mountPoint"] == "/":
+            print(partition["uuid"])
+            return partition["uuid"]
+    return ""
+    
+def create_conf(uuid, conf_path):
+    distribution = libcalamares.job.configuration["distribution"]
+    lines = [
+        '## This is just an exmaple config file.\n',
+        '## Please edit the paths and kernel parameters according to your system.\n',
+        '\n',
+        'title   %s GNU/Linux, with Linux core repo kernel\n' % distribution,
+        'linux   /vmlinuz-linux\n',
+        'initrd  /initramfs-linux.img\n',
+        'options root=UUID=%s quiet rw\n' % uuid,
+    ]
+    
+    with open(conf_path, 'w') as f:
+        for l in lines:
+            f.write(l)
+    f.close()
+  
+def create_loader(loader_path):
+    distribution = libcalamares.job.configuration["distribution"]
+    timeout = libcalamares.job.configuration["timeout"]
+    lines = [
+        'timeout %s\n' % timeout,
+        'default %s\n' % distribution,
+    ]
+    
+    with open(loader_path, 'w') as f:
+        for l in lines:
+            f.write(l)
+    f.close()
+    
+def install_grub(boot_loader, fw_type):
+    if fw_type == 'efi':
+        install_path = libcalamares.globalstorage.value( "rootMountPoint" )
+        uuid = get_uuid()
+        distribution = libcalamares.job.configuration["distribution"]
+        conf_path = os.path.join(install_path, "boot", "loader", "entries", "%s.conf" % distribution)
+        loader_path = os.path.join(install_path, "boot", "loader", "loader.conf")
+        subprocess.call(["gummiboot", "--path=%s/boot" % install_path, "install"])
+        create_conf(uuid, conf_path)
+        create_loader(loader_path)
+    else:
+        install_path = boot_loader["installPath"]
+        check_chroot_call(["grub-install", install_path])
+        check_chroot_call(["grub-mkconfig", "-o", "/boot/grub/grub.cfg"])
+
+def run():
+    detect_firmware_type()
+    boot_loader = libcalamares.globalstorage.value("bootLoader")
+    fw_type = libcalamares.globalstorage.value("firmwareType")
+    install_grub(boot_loader, fw_type)
+    return None

src/modules/bootloader/module.desc

@@ -0,0 +1,5 @@
+---
+type:       "job"
+name:       "bootloader"
+interface:  "python"
+script:     "main.py"

src/modules/bootloader/test.yaml

@@ -0,0 +1,3 @@
+rootMountPoint: /tmp/mount
+bootLoader:
+    installPath: /dev/sdb

src/modules/mount/main.py

@@ -48,12 +48,16 @@ def run():
     root_mount_point = tempfile.mkdtemp(prefix="calamares-root-")
     partitions = libcalamares.globalstorage.value("partitions")
     extra_mounts = libcalamares.job.configuration["extraMounts"]
+    extra_mounts_efi = libcalamares.job.configuration["extraMountsEfi"]
 
     # Sort by mount points to ensure / is mounted before the rest
     partitions.sort(key=lambda x: x["mountPoint"])
     mount_partitions(root_mount_point, partitions)
 
     mount_partitions(root_mount_point, extra_mounts)
+    
+    if(os.path.exists("/sys/firmware/efi/efivars")):
+        mount_partitions(root_mount_point, extra_mounts_efi)
 
     libcalamares.globalstorage.insert("rootMountPoint", root_mount_point)
     return None

src/modules/mount/mount.conf

@@ -9,3 +9,9 @@ extraMounts:
     - device: /dev
       mountPoint: /dev
       options: bind
+
+extraMountsEfi:
+    - device: /sys/firmware/efi
+      mountPoint: /sys/firmware/efi
+      options: bind
+