From a01d4707e11eceb50d45076855a09e8d8c080ef4 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Mon, 6 May 2019 15:08:10 +0200 Subject: [PATCH] [partition] Do not unmount /dev/mapper/live-* in ClearMountsJob src/modules/partition/jobs/ClearMountsJob.cpp (ClearMountsJob::getCryptoDevices): Skip not only `/dev/mapper/control`, but also `/dev/mapper/live-*`. Fedora live images use `/dev/mapper/live-*` internally. We must not unmount those devices, because they are used by the live image and because we need `/dev/mapper/live-base` in the `unpackfs` module. --- src/modules/partition/jobs/ClearMountsJob.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/modules/partition/jobs/ClearMountsJob.cpp b/src/modules/partition/jobs/ClearMountsJob.cpp index da6bee325..605087147 100644 --- a/src/modules/partition/jobs/ClearMountsJob.cpp +++ b/src/modules/partition/jobs/ClearMountsJob.cpp @@ -2,6 +2,7 @@ * * Copyright 2014-2015, Teo Mrnjavac * Copyright 2018, Adriaan de Groot + * Copyright 2019, Kevin Kofler * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -258,7 +259,11 @@ ClearMountsJob::getCryptoDevices() const QProcess process; for ( const QFileInfo &fi : fiList ) { - if ( fi.baseName() == "control" ) + QString baseName = fi.baseName(); + // Fedora live images use /dev/mapper/live-* internally. We must not + // unmount those devices, because they are used by the live image and + // because we need /dev/mapper/live-base in the unpackfs module. + if ( baseName == "control" || baseName.startsWith( "live-" ) ) continue; list.append( fi.absoluteFilePath() ); }