From 11922e074d041684cec63efbceb0697bb24bc213 Mon Sep 17 00:00:00 2001 From: demmm Date: Thu, 14 Jan 2016 12:40:08 -0500 Subject: [PATCH] set default umount.conf to not find any file adjust readme to refelect option to also use default Calamares.log --- src/modules/umount/README.md | 7 ++++--- src/modules/umount/umount.conf | 10 ++++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/modules/umount/README.md b/src/modules/umount/README.md index 48a8e3345..2a0ccace3 100644 --- a/src/modules/umount/README.md +++ b/src/modules/umount/README.md @@ -2,7 +2,8 @@ --------- This module represents the last part of the installation, the unmounting of partitions used for the install. It is also the last place where it is possible to copy files to the target system, thus the best place to copy an installation log. -To be able to use the copy an installation log of this module you will need to include a log creation to your launcher script or add it to the used calamares.desktop, example of a launcher script: +You can either use the default ```/root/.cache/Calamares/Calamares/Calamares.log``` +to copy or if you want to use the full output of ```sudo calamares -d``` to create a log you will need to include a log creation to your launcher script or add it to the used calamares.desktop, example of a launcher script: ``` #!/bin/sh @@ -12,6 +13,6 @@ Example desktop line: ``` Exec=sudo /usr/bin/calamares -d > installation.log ``` -Set the source and destination path of your install log in umount.conf -If you do not wish to use the copy of an install log feature, no action needed, the module will not execute the copy of a log code if no log is present. +Set the source and destination path of your install log in umount.conf. +If you do not wish to use the copy of an install log feature, no action needed, the default settings do not execute the copy of an install log in this module. diff --git a/src/modules/umount/umount.conf b/src/modules/umount/umount.conf index 59489fa1c..4dc0a8176 100644 --- a/src/modules/umount/umount.conf +++ b/src/modules/umount/umount.conf @@ -1,3 +1,9 @@ --- -srcLog: "/home/live/installation.log" -destLog: "/var/log/installation.log" +scrLog: "/path/to/installation.log" +destLog: "/var/log/installation.log" +# example when using the Calamares created log: +#srcLog: "/root/.cache/Calamares/Calamares/Calamares.log" +#destLog: "/var/log/Calamares.log" +# example when creating with a sudo calamares -d log: +#srcLog: "/home/live/installation.log" +#destLog: "/var/log/installation.log"