[umount] Start C++ port
This commit is contained in:
Adriaan de Groot
parent
5e4866c439
commit
afa5e75d76
18
src/modules/umount/CMakeLists.txt
Normal file
18
src/modules/umount/CMakeLists.txt
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
# === This file is part of Calamares - <https://calamares.io> ===
|
||||||
|
#
|
||||||
|
# SPDX-FileCopyrightText: 2021 Adriaan de Groot <groot@kde.org>
|
||||||
|
# SPDX-License-Identifier: BSD-2-Clause
|
||||||
|
#
|
||||||
|
calamares_add_plugin( umount
|
||||||
|
TYPE job
|
||||||
|
EXPORT_MACRO PLUGINDLLEXPORT_PRO
|
||||||
|
SOURCES
|
||||||
|
UmountJob.cpp
|
||||||
|
SHARED_LIB
|
||||||
|
)
|
||||||
|
|
||||||
|
calamares_add_test(
|
||||||
|
umounttest
|
||||||
|
SOURCES
|
||||||
|
Tests.cpp
|
||||||
|
)
|
||||||
52
src/modules/umount/Tests.cpp
Normal file
52
src/modules/umount/Tests.cpp
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
/* === This file is part of Calamares - <https://calamares.io> ===
|
||||||
|
*
|
||||||
|
* SPDX-FileCopyrightText: 2021 Adriaan de Groot <groot@kde.org>
|
||||||
|
* SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
*
|
||||||
|
* Calamares is Free Software: see the License-Identifier above.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "UmountJob.h"
|
||||||
|
|
||||||
|
#include "GlobalStorage.h"
|
||||||
|
#include "JobQueue.h"
|
||||||
|
#include "utils/CalamaresUtilsSystem.h"
|
||||||
|
#include "utils/Logger.h"
|
||||||
|
|
||||||
|
#include <QDir>
|
||||||
|
#include <QFile>
|
||||||
|
#include <QtTest/QtTest>
|
||||||
|
|
||||||
|
// Internals of UmountJob.cpp
|
||||||
|
|
||||||
|
// Actual tests
|
||||||
|
class UmountTests : public QObject
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
public:
|
||||||
|
UmountTests() {}
|
||||||
|
~UmountTests() override {}
|
||||||
|
|
||||||
|
private Q_SLOTS:
|
||||||
|
void initTestCase();
|
||||||
|
void testTrue();
|
||||||
|
};
|
||||||
|
|
||||||
|
void
|
||||||
|
UmountTests::initTestCase()
|
||||||
|
{
|
||||||
|
Logger::setupLogLevel( Logger::LOGDEBUG );
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
UmountTests::testTrue()
|
||||||
|
{
|
||||||
|
QVERIFY( true );
|
||||||
|
}
|
||||||
|
|
||||||
|
QTEST_GUILESS_MAIN( UmountTests )
|
||||||
|
|
||||||
|
#include "utils/moc-warnings.h"
|
||||||
|
|
||||||
|
#include "Tests.moc"
|
||||||
51
src/modules/umount/UmountJob.cpp
Normal file
51
src/modules/umount/UmountJob.cpp
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
/* === This file is part of Calamares - <https://calamares.io> ===
|
||||||
|
*
|
||||||
|
* Tags from the Python version of this module:
|
||||||
|
* SPDX-FileCopyrightText: 2014 Aurélien Gâteau <agateau@kde.org>
|
||||||
|
* SPDX-FileCopyrightText: 2016 Anke Boersma <demm@kaosx.us>
|
||||||
|
* SPDX-FileCopyrightText: 2018 Adriaan de Groot <groot@kde.org>
|
||||||
|
* Tags for the C++ version of this module:
|
||||||
|
* SPDX-FileCopyrightText: 2021 Adriaan de Groot <groot@kde.org>
|
||||||
|
* SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
*
|
||||||
|
* Calamares is Free Software: see the License-Identifier above.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "UmountJob.h"
|
||||||
|
|
||||||
|
#include "utils/CalamaresUtilsSystem.h"
|
||||||
|
#include "utils/Logger.h"
|
||||||
|
#include "utils/Variant.h"
|
||||||
|
|
||||||
|
#include "GlobalStorage.h"
|
||||||
|
#include "JobQueue.h"
|
||||||
|
|
||||||
|
#include <QFile>
|
||||||
|
|
||||||
|
|
||||||
|
UmountJob::UmountJob( QObject* parent )
|
||||||
|
: Calamares::CppJob( parent )
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
UmountJob::~UmountJob() {}
|
||||||
|
|
||||||
|
QString
|
||||||
|
UmountJob::prettyName() const
|
||||||
|
{
|
||||||
|
return tr( "Unmount file systems." );
|
||||||
|
}
|
||||||
|
|
||||||
|
Calamares::JobResult
|
||||||
|
UmountJob::exec()
|
||||||
|
{
|
||||||
|
return Calamares::JobResult::ok();
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
UmountJob::setConfigurationMap( const QVariantMap& map )
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
CALAMARES_PLUGIN_FACTORY_DEFINITION( UmountJobFactory, registerPlugin< UmountJob >(); )
|
||||||
41
src/modules/umount/UmountJob.h
Normal file
41
src/modules/umount/UmountJob.h
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
/* === This file is part of Calamares - <https://calamares.io> ===
|
||||||
|
*
|
||||||
|
* SPDX-FileCopyrightText: 2021 Adriaan de Groot <groot@kde.org>
|
||||||
|
* SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
*
|
||||||
|
* Calamares is Free Software: see the License-Identifier above.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef UMOUNTJOB_H
|
||||||
|
#define UMOUNTJOB_H
|
||||||
|
|
||||||
|
#include "CppJob.h"
|
||||||
|
#include "DllMacro.h"
|
||||||
|
#include "utils/PluginFactory.h"
|
||||||
|
|
||||||
|
#include <QObject>
|
||||||
|
#include <QStringList>
|
||||||
|
#include <QVariantMap>
|
||||||
|
|
||||||
|
/** @brief Write 'random' data: machine id, entropy, UUIDs
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
class PLUGINDLLEXPORT UmountJob : public Calamares::CppJob
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
explicit UmountJob( QObject* parent = nullptr );
|
||||||
|
~UmountJob() override;
|
||||||
|
|
||||||
|
QString prettyName() const override;
|
||||||
|
|
||||||
|
Calamares::JobResult exec() override;
|
||||||
|
|
||||||
|
void setConfigurationMap( const QVariantMap& configurationMap ) override;
|
||||||
|
};
|
||||||
|
|
||||||
|
CALAMARES_PLUGIN_FACTORY_DECLARATION( UmountJobFactory )
|
||||||
|
|
||||||
|
#endif // UMOUNTJOB_H
|
||||||
@ -1,126 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
#
|
|
||||||
# === This file is part of Calamares - <https://calamares.io> ===
|
|
||||||
#
|
|
||||||
# SPDX-FileCopyrightText: 2014 Aurélien Gâteau <agateau@kde.org>
|
|
||||||
# SPDX-FileCopyrightText: 2016 Anke Boersma <demm@kaosx.us>
|
|
||||||
# SPDX-FileCopyrightText: 2018 Adriaan de Groot <groot@kde.org>
|
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
#
|
|
||||||
# Calamares is Free Software: see the License-Identifier above.
|
|
||||||
#
|
|
||||||
|
|
||||||
import os
|
|
||||||
import subprocess
|
|
||||||
import shutil
|
|
||||||
|
|
||||||
import libcalamares
|
|
||||||
from libcalamares.utils import gettext_path, gettext_languages
|
|
||||||
|
|
||||||
import gettext
|
|
||||||
_translation = gettext.translation("calamares-python",
|
|
||||||
localedir=gettext_path(),
|
|
||||||
languages=gettext_languages(),
|
|
||||||
fallback=True)
|
|
||||||
_ = _translation.gettext
|
|
||||||
_n = _translation.ngettext
|
|
||||||
|
|
||||||
|
|
||||||
def pretty_name():
|
|
||||||
return _( "Unmount file systems." )
|
|
||||||
|
|
||||||
|
|
||||||
def list_mounts(root_mount_point):
|
|
||||||
""" List mount points.
|
|
||||||
|
|
||||||
:param root_mount_point:
|
|
||||||
:return:
|
|
||||||
"""
|
|
||||||
lst = []
|
|
||||||
|
|
||||||
root_mount_point = os.path.normpath(root_mount_point)
|
|
||||||
for line in open("/etc/mtab").readlines():
|
|
||||||
device, mount_point, _ = line.split(" ", 2)
|
|
||||||
|
|
||||||
if os.path.commonprefix([root_mount_point, mount_point]) == root_mount_point:
|
|
||||||
lst.append((device, mount_point))
|
|
||||||
|
|
||||||
return lst
|
|
||||||
|
|
||||||
|
|
||||||
def export_zpools(root_mount_point):
|
|
||||||
""" Exports the zpools if defined in global storage
|
|
||||||
|
|
||||||
:param root_mount_point: The absolute path to the root of the install
|
|
||||||
:return:
|
|
||||||
"""
|
|
||||||
try:
|
|
||||||
zfs_pool_list = libcalamares.globalstorage.value("zfsPoolInfo")
|
|
||||||
zfs_pool_list.sort(reverse=True, key=lambda x: x["poolName"])
|
|
||||||
if zfs_pool_list:
|
|
||||||
for zfs_pool in zfs_pool_list:
|
|
||||||
try:
|
|
||||||
libcalamares.utils.host_env_process_output(['zpool', 'export', zfs_pool["poolName"]])
|
|
||||||
except subprocess.CalledProcessError:
|
|
||||||
libcalamares.utils.warning("Failed to export zpool")
|
|
||||||
except Exception as e:
|
|
||||||
# If this fails it shouldn't cause the installation to fail
|
|
||||||
libcalamares.utils.warning("Received exception while exporting zpools: " + format(e))
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
def run():
|
|
||||||
""" Unmounts given mountpoints in decreasing order.
|
|
||||||
|
|
||||||
:return:
|
|
||||||
"""
|
|
||||||
root_mount_point = libcalamares.globalstorage.value("rootMountPoint")
|
|
||||||
|
|
||||||
if(libcalamares.job.configuration and
|
|
||||||
"srcLog" in libcalamares.job.configuration or
|
|
||||||
"destLog" in libcalamares.job.configuration):
|
|
||||||
libcalamares.utils.error("Log-file preserving is **deprecated** in the *umount* module and removed in the next release")
|
|
||||||
if(libcalamares.job.configuration and
|
|
||||||
"srcLog" in libcalamares.job.configuration and
|
|
||||||
"destLog" in libcalamares.job.configuration):
|
|
||||||
log_source = libcalamares.job.configuration["srcLog"]
|
|
||||||
log_destination = libcalamares.job.configuration["destLog"]
|
|
||||||
# Relocate log_destination into target system
|
|
||||||
log_destination = '{!s}/{!s}'.format(root_mount_point, log_destination)
|
|
||||||
# Make sure source is a string
|
|
||||||
log_source = '{!s}'.format(log_source)
|
|
||||||
|
|
||||||
# copy installation log before umount
|
|
||||||
if os.path.exists(log_source):
|
|
||||||
try:
|
|
||||||
shutil.copy2(log_source, log_destination)
|
|
||||||
except Exception as e:
|
|
||||||
libcalamares.utils.warning("Could not preserve file {!s}, "
|
|
||||||
"error {!s}".format(log_source, e))
|
|
||||||
|
|
||||||
if not root_mount_point:
|
|
||||||
return ("No mount point for root partition in globalstorage",
|
|
||||||
"globalstorage does not contain a \"rootMountPoint\" key, "
|
|
||||||
"doing nothing")
|
|
||||||
|
|
||||||
if not os.path.exists(root_mount_point):
|
|
||||||
return ("Bad mount point for root partition in globalstorage",
|
|
||||||
"globalstorage[\"rootMountPoint\"] is \"{}\", which does not "
|
|
||||||
"exist, doing nothing".format(root_mount_point))
|
|
||||||
|
|
||||||
lst = list_mounts(root_mount_point)
|
|
||||||
# Sort the list by mount point in decreasing order. This way we can be sure
|
|
||||||
# we unmount deeper dirs first.
|
|
||||||
lst.sort(key=lambda x: x[1], reverse=True)
|
|
||||||
|
|
||||||
for device, mount_point in lst:
|
|
||||||
# On success, no output; if the command fails, its output is
|
|
||||||
# in the exception object.
|
|
||||||
subprocess.check_output(["umount", "-lv", mount_point], stderr=subprocess.STDOUT)
|
|
||||||
|
|
||||||
export_zpools(root_mount_point)
|
|
||||||
|
|
||||||
os.rmdir(root_mount_point)
|
|
||||||
|
|
||||||
return None
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
# SPDX-FileCopyrightText: no
|
|
||||||
# SPDX-License-Identifier: CC0-1.0
|
|
||||||
---
|
|
||||||
type: "job"
|
|
||||||
name: "umount"
|
|
||||||
interface: "python"
|
|
||||||
script: "main.py"
|
|
||||||
emergency: true
|
|
||||||
Loading…
Reference in New Issue
Block a user