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

[bootloader] make gummiboot entries more generic (use branding)

Browse Source
This commit is contained in:
Philip Müller 2015-02-19 17:39:11 +01:00
parent df9a2e38a8
commit 93f0de3f7f
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/modules/bootloader/bootloader.conf
View File

@ -5,15 +5,15 @@ efiBootLoader: "grub"
# Gummiboot configuration files settings, set kernel and initramfs file names # Gummiboot configuration files settings, set kernel and initramfs file names
# and amount of time before default selection boots # and amount of time before default selection boots
# Optionally set the menu entry name to use in Gummiboot. If not specified here,
# this setting will be taken from branding.desc.
# bootloaderEntryName: "KaOS-kf5"
kernel: "/vmlinuz-linux" kernel: "/vmlinuz-linux"
img: "/initramfs-linux.img" img: "/initramfs-linux.img"
fallback: "/initramfs-linux-fallback.img" fallback: "/initramfs-linux-fallback.img"
kernelLine: "Linux core repo kernel"
fallbackKernelLine: "Linux fallback kernel"
timeout: "10" timeout: "10"
# Optionally set the menu entry name and kenrnel namesto use in Gummiboot.
# If not specified here, this setting will be taken from branding.desc.
# productName: "Generic GNU/Linux"
# kernelLine: " with Stable-Kernel"
# fallbackKernelLine: " with Stable-Kernel (fallback initramfs)"
# GRUB 2 binary names and boot directory # GRUB 2 binary names and boot directory
# Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names. # Some distributions (e.g. Fedora) use grub2-* (resp. /boot/grub2/) names.

26
src/modules/bootloader/main.py
View File

@ -45,11 +45,24 @@ def get_uuid():
def get_bootloader_entry_name(): def get_bootloader_entry_name():
if "bootloaderEntryName" in libcalamares.job.configuration: if "productName" in libcalamares.job.configuration:
return libcalamares.job.configuration["bootloaderEntryName"] return libcalamares.job.configuration["bootloaderEntryName"]
else: else:
branding = libcalamares.globalstorage.value("branding") branding = libcalamares.globalstorage.value("branding")
return branding["bootloaderEntryName"] return branding["productName"]
def get_kernel_line(kernel_type):
if "bootloaderEntryName" in libcalamares.job.configuration:
if kernel_type == "fallback":
return libcalamares.job.configuration["fallbackKernelLine"]
else:
return libcalamares.job.configuration["kernelLine"]
else:
if kernel_type == "fallback":
return " (fallback)"
else:
return ""
def create_conf(uuid, conf_path, kernel_line): def create_conf(uuid, conf_path, kernel_line):
@ -66,7 +79,7 @@ def create_conf(uuid, conf_path, kernel_line):
'## This is just an example config file.\n', '## This is just an example config file.\n',
'## Please edit the paths and kernel parameters according to your system.\n', '## Please edit the paths and kernel parameters according to your system.\n',
'\n', '\n',
"title {!s} GNU/Linux, with {!s}\n".format(distribution,kernel_line), "title {!s}{!s}\n".format(distribution,kernel_line),
"linux {!s}\n".format(kernel), "linux {!s}\n".format(kernel),
"initrd {!s}\n".format(img), "initrd {!s}\n".format(img),
"options root=UUID={!s} quiet resume=UUID={!s} rw\n".format(uuid, swap), "options root=UUID={!s} quiet resume=UUID={!s} rw\n".format(uuid, swap),
@ -97,7 +110,6 @@ def create_loader(loader_path):
def install_gummiboot(efi_directory): def install_gummiboot(efi_directory):
install_path = libcalamares.globalstorage.value("rootMountPoint") install_path = libcalamares.globalstorage.value("rootMountPoint")
install_efi_directory = install_path + efi_directory install_efi_directory = install_path + efi_directory
kernel_line = libcalamares.job.configuration["kernelLine"]
fallback_kernel_line = libcalamares.job.configuration["fallbackKernelLine"] fallback_kernel_line = libcalamares.job.configuration["fallbackKernelLine"]
uuid = get_uuid() uuid = get_uuid()
distribution = get_bootloader_entry_name() distribution = get_bootloader_entry_name()
@ -112,10 +124,12 @@ def install_gummiboot(efi_directory):
loader_path = os.path.join( loader_path = os.path.join(
install_efi_directory, "loader", "loader.conf") install_efi_directory, "loader", "loader.conf")
subprocess.call(["gummiboot", "--path={!s}".format(install_efi_directory), "install"]) subprocess.call(["gummiboot", "--path={!s}".format(install_efi_directory), "install"])
kernel_line = get_bootloader_entry_name("default")
print("Configure: \"{!s}\"".format(kernel_line)) print("Configure: \"{!s}\"".format(kernel_line))
create_conf(uuid, conf_path, kernel_line) create_conf(uuid, conf_path, kernel_line)
print("Configure: \"{!s}\"".format(fallback_kernel_line)) kernel_line = get_bootloader_entry_name("fallback")
create_conf(uuid, fallback_path, fallback_kernel_line) print("Configure: \"{!s}\"".format(kernel_line))
create_conf(uuid, fallback_path, kernel_line)
create_loader(loader_path) create_loader(loader_path)