From c587145bdde3c5e66a99f6025ef4770aff27362b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 17 Jan 2022 13:37:47 +0100
Subject: [PATCH] [umount] Drop all mention of removed configuration keys

---
 src/modules/umount/CMakeLists.txt     |  1 +
 src/modules/umount/umount.conf        | 15 +++------------
 src/modules/umount/umount.schema.yaml |  3 +--
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/modules/umount/CMakeLists.txt b/src/modules/umount/CMakeLists.txt
index a3f0e0f54..d72847007 100644
--- a/src/modules/umount/CMakeLists.txt
+++ b/src/modules/umount/CMakeLists.txt
@@ -9,6 +9,7 @@ calamares_add_plugin( umount
     SOURCES
         UmountJob.cpp
     SHARED_LIB
+    EMERGENCY
 )
 
 calamares_add_test(
diff --git a/src/modules/umount/umount.conf b/src/modules/umount/umount.conf
index 9743b12df..9fb922740 100644
--- a/src/modules/umount/umount.conf
+++ b/src/modules/umount/umount.conf
@@ -4,20 +4,11 @@
 ### Umount Module
 #
 # 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.
-#
-# The "copy log files" functionality is deprecated; use the *preservefiles*
-# module instead, which is more flexible.
-#
-# This module has two deprecated configuration keys:
-#   srcLog  location in the live system where the log is
-#   destLog location in the target system to copy the log
+# of partitions used for the install.  After this, there is no regular way
+# to modify the target system anymore.
 #
 
 ---
-srcLog: "/bogus/just/do/not/use/this/anymore.txt"
-
 # Setting emergency to true will make it so this module is still run
 # when a prior module fails
-# emergency: true
+emergency: false
diff --git a/src/modules/umount/umount.schema.yaml b/src/modules/umount/umount.schema.yaml
index 9b81db3d9..37771e5f6 100644
--- a/src/modules/umount/umount.schema.yaml
+++ b/src/modules/umount/umount.schema.yaml
@@ -6,5 +6,4 @@ $id: https://calamares.io/schemas/umount
 additionalProperties: false
 type: object
 properties:
-    srcLog: { type: string }
-    destLog: { type: string }
+    emergency: { type: boolean }