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

Use root_mount_point.

Browse Source
This commit is contained in:
Teo Mrnjavac 2016-05-13 17:36:40 +02:00
parent 4c2a327d21
commit 862ed86acc
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,9 +19,9 @@
# along with Calamares. If not, see <http://www.gnu.org/licenses/>. # along with Calamares. If not, see <http://www.gnu.org/licenses/>.
import libcalamares import libcalamares
import os.path
def write_openswap_conf(partitions, root_mount_point, openswap_conf_path):
def write_openswap_conf(partitions, openswap_conf_path):
swap_outer_uuid = "" swap_outer_uuid = ""
swap_mapper_name = "" swap_mapper_name = ""
mountable_keyfile_device = "" mountable_keyfile_device = ""
@ -40,7 +40,7 @@ def write_openswap_conf(partitions, openswap_conf_path):
swap_device_path = "/dev/disk/by-uuid/{!s}".format(swap_outer_uuid) swap_device_path = "/dev/disk/by-uuid/{!s}".format(swap_outer_uuid)
lines = [] lines = []
with open(openswap_conf_path, 'r') as openswap_file: with open(os.path.join(root_mount_point, openswap_conf_path), 'r') as openswap_file:
lines = [x.strip() for x in openswap_file.readlines()] lines = [x.strip() for x in openswap_file.readlines()]
for i in range(len(lines)): for i in range(len(lines)):
@ -56,7 +56,7 @@ def write_openswap_conf(partitions, openswap_conf_path):
elif lines[i].startswith("keyfile_filename"): elif lines[i].startswith("keyfile_filename"):
lines[i] = "keyfile_filename=crypto_keyfile.bin" lines[i] = "keyfile_filename=crypto_keyfile.bin"
with open(openswap_conf_path, 'w') as openswap_file: with open(os.path.join(root_mount_point, openswap_conf_path), 'w') as openswap_file:
openswap_file.write("\n".join(lines) + "\n") openswap_file.write("\n".join(lines) + "\n")
return None return None
@ -68,6 +68,7 @@ def run():
:return: :return:
""" """
root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
openswap_conf_path = libcalamares.job.configuration["configFilePath"] openswap_conf_path = libcalamares.job.configuration["configFilePath"]
partitions = libcalamares.globalstorage.value("partitions") partitions = libcalamares.globalstorage.value("partitions")
return write_openswap_conf(partitions, openswap_conf_path) return write_openswap_conf(partitions, root_mount_point, openswap_conf_path)