From efab699479eea1efc0c0faaef1d242cdca72b7bd Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 12 Aug 2020 10:05:46 +0200
Subject: [PATCH] [umount] Fix schema -- prefer *preservefiles* for keeping the
 log

---
 src/modules/umount/umount.conf        | 28 ++++-----------------------
 src/modules/umount/umount.schema.yaml |  4 ++--
 2 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/src/modules/umount/umount.conf b/src/modules/umount/umount.conf
index 22a2e7441..3d4eb7d95 100644
--- a/src/modules/umount/umount.conf
+++ b/src/modules/umount/umount.conf
@@ -2,35 +2,15 @@
 #
 # 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.
+# is possible to copy files to the target system.
+#
+# The "copy log files" functionality is deprecated; use the *preservefiles*
+# module instead, which is more flexible.
 #
 # This module has two configuration keys:
 #   srcLog  location in the live system where the log is
 #   destLog location in the target system to copy the log
 #
-# You can either use the default source path (which is
-# `/root/.cache/calamares/session.log` ) to copy the regular log,
-# or if you want to use the full output of `sudo calamares -d` you will need
-# to redirect standard output, for instance in a launcher script or
-# in the desktop file.
-#
-# Example launcher script:
-#
-# ```
-# #!/bin/sh
-# sudo /usr/bin/calamares -d > installation.log
-# ```
-#
-# Example desktop line:
-#
-# ```
-# Exec=sudo /usr/bin/calamares -d > installation.log
-# ```
-#
-# If no source and destination are set, no copy is attempted. If the
-# copy fails for some reason, a warning is printed but the installation
-# does not fail.
 
 ---
 # example when using the normal Calamares log:
diff --git a/src/modules/umount/umount.schema.yaml b/src/modules/umount/umount.schema.yaml
index b76a14ac6..585946fbe 100644
--- a/src/modules/umount/umount.schema.yaml
+++ b/src/modules/umount/umount.schema.yaml
@@ -4,5 +4,5 @@ $id: https://calamares.io/schemas/umount
 additionalProperties: false
 type: object
 properties:
-    "srcLog": { type: str }
-    "destLog": { type: str }
+    srcLog: { type: string }
+    destLog: { type: string }