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

[luksopenswaphookcfg] work on #797 and #796

Browse Source
This commit is contained in:
Philip 2017-09-12 05:10:41 -04:00
parent 6c00ce7e30
commit ff08c8ae83
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/modules/luksbootkeyfile/main.py
View File

@ -6,6 +6,7 @@
# Copyright 2016, Teo Mrnjavac <teo@kde.org> # Copyright 2016, Teo Mrnjavac <teo@kde.org>
# Copyright 2017, Alf Gaida <agaida@siduction.org> # Copyright 2017, Alf Gaida <agaida@siduction.org>
# Copyright 2017, Adriaan de Groot <groot@kde.org> # Copyright 2017, Adriaan de Groot <groot@kde.org>
# Copyright 2017, Philip Mueller <philm@manjaro.org>
# #
# Calamares is free software: you can redistribute it and/or modify # Calamares is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by

3
src/modules/luksopenswaphookcfg/main.py
View File

@ -5,6 +5,7 @@
# #
# Copyright 2016, Teo Mrnjavac <teo@kde.org> # Copyright 2016, Teo Mrnjavac <teo@kde.org>
# Copyright 2017, Alf Gaida <agaida@siduction.org> # Copyright 2017, Alf Gaida <agaida@siduction.org>
# Copyright 2017, Philip Mueller <philm@manjaro.org>
# #
# Calamares is free software: you can redistribute it and/or modify # Calamares is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -29,7 +30,7 @@ def write_openswap_conf(partitions, root_mount_point, openswap_conf_path):
mountable_keyfile_device = "" mountable_keyfile_device = ""
for partition in partitions: for partition in partitions:
if partition["fs"] == "linuxswap" and "luksMapperName" in partition: if partition["fs"].lower() == "linuxswap" and "luksMapperName" in partition:
swap_outer_uuid = partition["luksUuid"] swap_outer_uuid = partition["luksUuid"]
swap_mapper_name = partition["luksMapperName"] swap_mapper_name = partition["luksMapperName"]