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

[partition] Do not unmount /dev/mapper/live-* in ClearMountsJob

Browse Source 
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.
This commit is contained in:
Kevin Kofler 2019-05-06 15:08:10 +02:00
parent 71d991e2e4
commit a01d4707e1
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/partition/jobs/ClearMountsJob.cpp
View File

@ -2,6 +2,7 @@
* *
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org> * Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
* Copyright 2018, Adriaan de Groot <groot@kde.org> * Copyright 2018, Adriaan de Groot <groot@kde.org>
* Copyright 2019, Kevin Kofler <kevin.kofler@chello.at>
* *
* Calamares is free software: you can redistribute it and/or modify * Calamares is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -258,7 +259,11 @@ ClearMountsJob::getCryptoDevices() const
QProcess process; QProcess process;
for ( const QFileInfo &fi : fiList ) 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; continue;
list.append( fi.absoluteFilePath() ); list.append( fi.absoluteFilePath() );
} }