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

[initcpiocfg] fix syntax

Browse Source
This commit is contained in:
Philip Müller 2018-09-26 22:08:02 +02:00
parent 8a2c5c1727
commit c89a55fc83
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/grubcfg/main.py
View File

@ -103,14 +103,14 @@ def modify_grub_default(partitions, root_mount_point, distributor):
kernel_params = ["quiet"] kernel_params = ["quiet"]
if os.path.exists(join(self.root, "usr/bin/grub-set-bootflag")): if os.path.exists(os.path.join(self.root, "usr/bin/grub-set-bootflag")):
kernel_params.append = ["loglevel=3", "vga=current", "rd.systemd.show_status=auto", kernel_params.append = ["loglevel=3", "vga=current", "rd.systemd.show_status=auto",
"rd.udev.log-priority=3", "vt.global_cursor_default=0"] "rd.udev.log-priority=3", "vt.global_cursor_default=0"]
if cryptdevice_params: if cryptdevice_params:
kernel_params.extend(cryptdevice_params) kernel_params.extend(cryptdevice_params)
if use_splash and not os.path.exists(join(self.root, "usr/bin/grub-set-bootflag")): if use_splash and not os.path.exists(os.path.join(self.root, "usr/bin/grub-set-bootflag")):
kernel_params.append(use_splash) kernel_params.append(use_splash)
if swap_uuid: if swap_uuid:
@ -161,7 +161,7 @@ def modify_grub_default(partitions, root_mount_point, distributor):
existing_param_name = existing_param.split("=")[0] existing_param_name = existing_param.split("=")[0]
# the only ones we ever add # the only ones we ever add
if not os.path.exists(join(self.root, "usr/bin/grub-set-bootflag")) if not os.path.exists(os.path.join(self.root, "usr/bin/grub-set-bootflag"))
and existing_param_name not in ["quiet", "resume", "splash"]: and existing_param_name not in ["quiet", "resume", "splash"]:
kernel_params.append(existing_param) kernel_params.append(existing_param)

4
src/modules/initcpiocfg/main.py
View File

@ -4,7 +4,7 @@
# === This file is part of Calamares - <https://github.com/calamares> === # === This file is part of Calamares - <https://github.com/calamares> ===
# #
# Copyright 2014, Rohan Garg <rohan@kde.org> # Copyright 2014, Rohan Garg <rohan@kde.org>
# Copyright 2015, Philip Müller <philm@manjaro.org> # Copyright 2015 - 2018, Philip Müller <philm@manjaro.org>
# Copyright 2017, Alf Gaida <agaida@sidution.org> # Copyright 2017, Alf Gaida <agaida@sidution.org>
# #
# Calamares is free software: you can redistribute it and/or modify # Calamares is free software: you can redistribute it and/or modify
@ -156,7 +156,7 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
elif (btrfs == "yes" elif (btrfs == "yes"
and cpu['proc0']['vendor_id'].lower() == "genuineintel"): and cpu['proc0']['vendor_id'].lower() == "genuineintel"):
modules.append("crc32c-intel") modules.append("crc32c-intel")
elif not os.path.exists(join(self.root, "usr/bin/grub-set-bootflag")): elif not os.path.exists(os.path.join(self.root, "usr/bin/grub-set-bootflag")):
hooks.append("fsck") hooks.append("fsck")
write_mkinitcpio_lines(hooks, modules, files, root_mount_point) write_mkinitcpio_lines(hooks, modules, files, root_mount_point)