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

Don't crash on bad log path.

Browse Source
This commit is contained in:
Teo Mrnjavac 2016-01-21 11:31:45 +01:00
parent 6c5be4e60a
commit 19f207ed42
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/umount/main.py
View File

@ -51,11 +51,12 @@ def run():
root_mount_point = libcalamares.globalstorage.value("rootMountPoint") root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
log_source = libcalamares.job.configuration["srcLog"] log_source = libcalamares.job.configuration["srcLog"]
log_destination = libcalamares.job.configuration["destLog"] log_destination = libcalamares.job.configuration["destLog"]
# copy installation log before umount # copy installation log before umount
if(os.path.exists('{!s}'.format(log_source))): if(log_source)
shutil.copy2('{!s}'.format(log_source), '{!s}/{!s}'.format( if(os.path.exists('{!s}'.format(log_source))):
root_mount_point, log_destination)) shutil.copy2('{!s}'.format(log_source), '{!s}/{!s}'.format(
root_mount_point, log_destination))
if not root_mount_point: if not root_mount_point:
return ("No mount point for root partition in globalstorage", return ("No mount point for root partition in globalstorage",

4
src/modules/umount/umount.conf
View File

@ -1,6 +1,6 @@
--- ---
scrLog: "/path/to/installation.log" #scrLog: "/path/to/installation.log"
destLog: "/var/log/installation.log" #destLog: "/var/log/installation.log"
# example when using the Calamares created log: # example when using the Calamares created log:
#srcLog: "/root/.cache/Calamares/Calamares/Calamares.log" #srcLog: "/root/.cache/Calamares/Calamares/Calamares.log"
#destLog: "/var/log/Calamares.log" #destLog: "/var/log/Calamares.log"