[initramfs] Replace module with C++ implementation
- new implementation handles blank (maps to "all") configuration, - allows specifying "$uname" as kernel name, to use `uname -r`, - allows specifying a specific kernel.
This commit is contained in:
parent
b216daf574
commit
8d712276ad
74
src/modules/initramfs/InitramfsJob.cpp
Normal file
74
src/modules/initramfs/InitramfsJob.cpp
Normal file
@ -0,0 +1,74 @@
|
|||||||
|
/* === This file is part of Calamares - <https://github.com/calamares> ===
|
||||||
|
*
|
||||||
|
* Copyright 2019, Adriaan de Groot <groot@kde.org>
|
||||||
|
*
|
||||||
|
* Calamares is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* Calamares is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "InitramfsJob.h"
|
||||||
|
|
||||||
|
#include "utils/CalamaresUtilsSystem.h"
|
||||||
|
#include "utils/Logger.h"
|
||||||
|
#include "utils/Variant.h"
|
||||||
|
|
||||||
|
InitramfsJob::InitramfsJob( QObject* parent )
|
||||||
|
: Calamares::CppJob( parent )
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
InitramfsJob::~InitramfsJob() {}
|
||||||
|
|
||||||
|
|
||||||
|
QString
|
||||||
|
InitramfsJob::prettyName() const
|
||||||
|
{
|
||||||
|
return tr( "Creating initramfs." );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Calamares::JobResult
|
||||||
|
InitramfsJob::exec()
|
||||||
|
{
|
||||||
|
auto r = CalamaresUtils::System::instance()->targetEnvCommand(
|
||||||
|
{ "update-initramfs", "-k", m_kernel, "-c", "-t" }, QString(), QString(), 10 );
|
||||||
|
return r.explainProcess( "update-initramfs", 10 );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void
|
||||||
|
InitramfsJob::setConfigurationMap( const QVariantMap& configurationMap )
|
||||||
|
{
|
||||||
|
m_kernel = CalamaresUtils::getString( configurationMap, "kernel" );
|
||||||
|
if ( m_kernel.isEmpty() )
|
||||||
|
{
|
||||||
|
m_kernel = QStringLiteral( "all" );
|
||||||
|
}
|
||||||
|
else if ( m_kernel == "$uname" )
|
||||||
|
{
|
||||||
|
auto r = CalamaresUtils::System::runCommand(
|
||||||
|
CalamaresUtils::System::RunLocation::RunInHost, { "/bin/uname", "-r" }, QString(), QString(), 3 );
|
||||||
|
if ( r.getExitCode() == 0 )
|
||||||
|
{
|
||||||
|
m_kernel = r.getOutput();
|
||||||
|
cDebug() << "*initramfs* using running kernel" << m_kernel;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
cWarning() << "*initramfs* could not determine running kernel, using 'all'." << Logger::Continuation
|
||||||
|
<< r.getExitCode() << r.getOutput();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
CALAMARES_PLUGIN_FACTORY_DEFINITION( InitramfsJobFactory, registerPlugin< InitramfsJob >(); )
|
49
src/modules/initramfs/InitramfsJob.h
Normal file
49
src/modules/initramfs/InitramfsJob.h
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
/* === This file is part of Calamares - <https://github.com/calamares> ===
|
||||||
|
*
|
||||||
|
* Copyright 2019, Adriaan de Groot <groot@kde.org>
|
||||||
|
*
|
||||||
|
* Calamares is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* Calamares is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef INITRAMFSJOB_H
|
||||||
|
#define INITRAMFSJOB_H
|
||||||
|
|
||||||
|
#include "CppJob.h"
|
||||||
|
#include "PluginDllMacro.h"
|
||||||
|
#include "utils/PluginFactory.h"
|
||||||
|
|
||||||
|
#include <QObject>
|
||||||
|
#include <QVariantMap>
|
||||||
|
|
||||||
|
class PLUGINDLLEXPORT InitramfsJob : public Calamares::CppJob
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
explicit InitramfsJob( QObject* parent = nullptr );
|
||||||
|
virtual ~InitramfsJob() override;
|
||||||
|
|
||||||
|
QString prettyName() const override;
|
||||||
|
|
||||||
|
Calamares::JobResult exec() override;
|
||||||
|
|
||||||
|
void setConfigurationMap( const QVariantMap& configurationMap ) override;
|
||||||
|
|
||||||
|
private:
|
||||||
|
QString m_kernel;
|
||||||
|
};
|
||||||
|
|
||||||
|
CALAMARES_PLUGIN_FACTORY_DECLARATION( InitramfsJobFactory )
|
||||||
|
|
||||||
|
#endif // INITRAMFSJOB_H
|
@ -1,51 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
#
|
|
||||||
# === This file is part of Calamares - <https://github.com/calamares> ===
|
|
||||||
#
|
|
||||||
# Copyright 2014, Philip Müller <philm@manjaro.org>
|
|
||||||
# Copyright 2017, Alf Gaida <agaida@siduction.org>
|
|
||||||
# Copyright 2019, Adriaan de Groot <groot@kde.org>
|
|
||||||
#
|
|
||||||
# Calamares is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation, either version 3 of the License, or
|
|
||||||
# (at your option) any later version.
|
|
||||||
#
|
|
||||||
# Calamares is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with Calamares. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
import libcalamares
|
|
||||||
from libcalamares.utils import target_env_call
|
|
||||||
|
|
||||||
|
|
||||||
import gettext
|
|
||||||
_ = gettext.translation("calamares-python",
|
|
||||||
localedir=libcalamares.utils.gettext_path(),
|
|
||||||
languages=libcalamares.utils.gettext_languages(),
|
|
||||||
fallback=True).gettext
|
|
||||||
|
|
||||||
|
|
||||||
def pretty_name():
|
|
||||||
return _("Creating initramfs.")
|
|
||||||
|
|
||||||
|
|
||||||
def run():
|
|
||||||
""" Generate an initramfs image.
|
|
||||||
|
|
||||||
:return:
|
|
||||||
"""
|
|
||||||
return_code = target_env_call(["update-initramfs", "-k", "all", "-c",
|
|
||||||
"-t"])
|
|
||||||
|
|
||||||
if return_code != 0:
|
|
||||||
libcalamares.utils.debug("update-initramfs returned {}".format(return_code))
|
|
||||||
return (
|
|
||||||
_("Failed to run update-initramfs on the target"),
|
|
||||||
_("The exit code was {}").format(return_code)
|
|
||||||
)
|
|
Loading…
Reference in New Issue
Block a user