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

Merge branch 'master' into i18n-pythonjob

Browse Source
This commit is contained in:
Adriaan de Groot 2017-08-10 16:06:39 -04:00
commit d523a44407
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/dummypython/main.py
View File

@ -51,7 +51,7 @@ def run():
accumulator += "This job's path: " + libcalamares.job.working_path accumulator += "This job's path: " + libcalamares.job.working_path
libcalamares.utils.debug(accumulator) libcalamares.utils.debug(accumulator)
accumulator = "*** Job configuration "; accumulator = "*** Job configuration "
accumulator += str(libcalamares.job.configuration) accumulator += str(libcalamares.job.configuration)
libcalamares.utils.debug(accumulator) libcalamares.utils.debug(accumulator)

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

@ -27,7 +27,8 @@ def run():
:return: :return:
""" """
return_code = target_env_call(["update-initramfs", "-k", "all", "-u"]) return_code = target_env_call(["update-initramfs", "-k", "all", "-c",
"-t"])
if return_code != 0: if return_code != 0:
return ( return (

10
src/modules/initramfscfg/main.py
View File

@ -8,6 +8,7 @@
# Copyright 2016, David McKinney <mckinney@subgraph.com> # Copyright 2016, David McKinney <mckinney@subgraph.com>
# Copyright 2016, Kevin Kofler <kevin.kofler@chello.at> # Copyright 2016, Kevin Kofler <kevin.kofler@chello.at>
# Copyright 2017, Alf Gaida <agaida@siduction.org> # Copyright 2017, Alf Gaida <agaida@siduction.org>
# Copyright 2017, Adriaan de Groot <groot@kde.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
@ -48,14 +49,19 @@ def copy_initramfs_hooks(partitions, root_mount_point):
if encrypt_hook: if encrypt_hook:
target = "{!s}/usr/share/initramfs-tools/hooks/encrypt_hook".format( target = "{!s}/usr/share/initramfs-tools/hooks/encrypt_hook".format(
root_mount_point) root_mount_point)
# Find where this module is installed
_filename = inspect.getframeinfo(inspect.currentframe()).filename
_path = os.path.dirname(os.path.abspath(_filename))
if unencrypted_separate_boot: if unencrypted_separate_boot:
shutil.copy2( shutil.copy2(
"/usr/lib/calamares/modules/initramfscfg/encrypt_hook_nokey", os.path.join(_path, "encrypt_hook_nokey"),
target target
) )
else: else:
shutil.copy2( shutil.copy2(
"/usr/lib/calamares/modules/initramfscfg/encrypt_hook", os.path.join(_path, "encrypt_hook"),
target target
) )
os.chmod(target, 0o755) os.chmod(target, 0o755)