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

[initcpiocfg] adopt development changes

Browse Source
This commit is contained in:
Philip Müller 2018-10-23 19:03:07 +02:00
parent f451615a1b
commit 535da71b1e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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")
else: elif not os.path.exists(os.path.join(root_mount_point, "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)