Compare commits
6 Commits
v3.3.0
...
services-a
| Author | SHA1 | Date | |
|---|---|---|---|
| d6691aea6b | |||
|
|
115f00f5cd | ||
|
|
e73f5fb9fe | ||
|
|
cd0a381a35 | ||
|
|
709296940c | ||
|
|
00821945c5 |
12
CHANGES-3.3
12
CHANGES-3.3
@@ -8,6 +8,18 @@ changelog -- this log starts with version 3.3.0. See CHANGES-3.2 for
|
||||
the history of the 3.2 series (2018-05 - 2022-08).
|
||||
|
||||
|
||||
# 3.3.1 (unreleased)
|
||||
|
||||
This release contains contributions from (alphabetically by first name):
|
||||
- Nobody yet!
|
||||
|
||||
## Core ##
|
||||
- No changes of note.
|
||||
|
||||
## Modules ##
|
||||
- No changes of note.
|
||||
|
||||
|
||||
# 3.3.0 (2023-12-12)
|
||||
|
||||
This release contains contributions from (alphabetically by first name):
|
||||
|
||||
@@ -47,8 +47,8 @@
|
||||
|
||||
cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
|
||||
|
||||
set(CALAMARES_VERSION 3.3.0)
|
||||
set(CALAMARES_RELEASE_MODE ON) # Set to ON during a release
|
||||
set(CALAMARES_VERSION 3.3.1)
|
||||
set(CALAMARES_RELEASE_MODE OFF) # Set to ON during a release
|
||||
|
||||
if(CMAKE_SCRIPT_MODE_FILE)
|
||||
include(${CMAKE_CURRENT_LIST_DIR}/CMakeModules/ExtendedVersion.cmake)
|
||||
@@ -513,6 +513,7 @@ if(NOT CALAMARES_RELEASE_MODE)
|
||||
list(APPEND CALAMARES_TRANSLATION_LANGUAGES ${_tx_incomplete})
|
||||
endif()
|
||||
list(SORT CALAMARES_TRANSLATION_LANGUAGES)
|
||||
list(REMOVE_DUPLICATES CALAMARES_TRANSLATION_LANGUAGES)
|
||||
|
||||
add_subdirectory(lang) # i18n tools
|
||||
|
||||
|
||||
@@ -43,4 +43,8 @@ zypper --non-interactive in \
|
||||
|
||||
# Not actual dependencies, but good to have
|
||||
zypper --non-interactive in python311-PyYAML python311-jsonschema
|
||||
# vi to edit things inside the docker
|
||||
zypper --non-interactive in vim
|
||||
# noto so that running Calamares in the docker is readable
|
||||
zypper --non-interactive in noto-sans-fonts
|
||||
true
|
||||
|
||||
@@ -378,7 +378,7 @@ LocaleTests::testTZLookup()
|
||||
|
||||
QVERIFY( zones.find( "America", "New_York" ) );
|
||||
QCOMPARE( zones.find( "America", "New_York" )->zone(), QStringLiteral( "New_York" ) );
|
||||
QCOMPARE( zones.find( "America", "New_York" )->tr(), QStringLiteral( "New York" ) );
|
||||
QCOMPARE( zones.find( "America", "New_York" )->translated(), QStringLiteral( "New York" ) );
|
||||
|
||||
QVERIFY( !zones.find( "Europe", "New_York" ) );
|
||||
QVERIFY( !zones.find( "America", "New York" ) );
|
||||
|
||||
@@ -76,7 +76,7 @@ TimeZoneData::TimeZoneData( const QString& region,
|
||||
}
|
||||
|
||||
QString
|
||||
TimeZoneData::tr() const
|
||||
TimeZoneData::translated() const
|
||||
{
|
||||
// NOTE: context name must match what's used in zone-extractor.py
|
||||
return QObject::tr( m_human, "tz_names" );
|
||||
@@ -86,11 +86,11 @@ class RegionData : public TranslatableString
|
||||
{
|
||||
public:
|
||||
using TranslatableString::TranslatableString;
|
||||
QString tr() const override;
|
||||
QString translated() const override;
|
||||
};
|
||||
|
||||
QString
|
||||
RegionData::tr() const
|
||||
RegionData::translated() const
|
||||
{
|
||||
// NOTE: context name must match what's used in zone-extractor.py
|
||||
return QObject::tr( m_human, "tz_regions" );
|
||||
@@ -276,7 +276,7 @@ RegionsModel::data( const QModelIndex& index, int role ) const
|
||||
const auto& region = m_private->m_regions[ index.row() ];
|
||||
if ( role == NameRole )
|
||||
{
|
||||
return region->tr();
|
||||
return region->translated();
|
||||
}
|
||||
if ( role == KeyRole )
|
||||
{
|
||||
@@ -292,13 +292,13 @@ RegionsModel::roleNames() const
|
||||
}
|
||||
|
||||
QString
|
||||
RegionsModel::tr( const QString& region ) const
|
||||
RegionsModel::translated( const QString& region ) const
|
||||
{
|
||||
for ( const auto* p : m_private->m_regions )
|
||||
{
|
||||
if ( p->key() == region )
|
||||
{
|
||||
return p->tr();
|
||||
return p->translated();
|
||||
}
|
||||
}
|
||||
return region;
|
||||
@@ -330,7 +330,7 @@ ZonesModel::data( const QModelIndex& index, int role ) const
|
||||
switch ( role )
|
||||
{
|
||||
case NameRole:
|
||||
return zone->tr();
|
||||
return zone->translated();
|
||||
case KeyRole:
|
||||
return zone->key();
|
||||
case RegionRole:
|
||||
|
||||
@@ -48,7 +48,7 @@ class TimeZoneData : public QObject, TranslatableString
|
||||
|
||||
Q_PROPERTY( QString region READ region CONSTANT )
|
||||
Q_PROPERTY( QString zone READ zone CONSTANT )
|
||||
Q_PROPERTY( QString name READ tr CONSTANT )
|
||||
Q_PROPERTY( QString name READ translated CONSTANT )
|
||||
Q_PROPERTY( QString countryCode READ country CONSTANT )
|
||||
|
||||
public:
|
||||
@@ -60,7 +60,7 @@ public:
|
||||
TimeZoneData( const TimeZoneData& ) = delete;
|
||||
TimeZoneData( TimeZoneData&& ) = delete;
|
||||
|
||||
QString tr() const override;
|
||||
QString translated() const override;
|
||||
|
||||
QString region() const { return m_region; }
|
||||
QString zone() const { return key(); }
|
||||
@@ -106,7 +106,7 @@ public Q_SLOTS:
|
||||
* Returns @p region unchanged if there is no such region
|
||||
* or no translation for the region's name.
|
||||
*/
|
||||
QString tr( const QString& region ) const;
|
||||
QString translated( const QString& region ) const;
|
||||
|
||||
private:
|
||||
Private* m_private;
|
||||
|
||||
@@ -41,7 +41,7 @@ public:
|
||||
virtual ~TranslatableString();
|
||||
|
||||
/// @brief Give the localized human-readable form
|
||||
virtual QString tr() const = 0;
|
||||
virtual QString translated() const = 0;
|
||||
QString key() const { return m_key; }
|
||||
|
||||
bool operator==( const TranslatableString& other ) const { return m_key == other.m_key; }
|
||||
|
||||
@@ -73,7 +73,9 @@ ExecutionViewStep::ExecutionViewStep( QObject* parent )
|
||||
{
|
||||
m_widget->setObjectName( "slideshow" );
|
||||
m_progressBar->setObjectName( "exec-progress" );
|
||||
m_progressBar->setFormat( tr( "%p%", "Progress percentage indicator: %p is where the number 0..100 is placed" ) );
|
||||
CALAMARES_RETRANSLATE(
|
||||
m_progressBar->setFormat( tr( "%p%", "Progress percentage indicator: %p is where the number 0..100 is placed" ) );
|
||||
);
|
||||
m_label->setObjectName( "exec-message" );
|
||||
|
||||
QVBoxLayout* layout = new QVBoxLayout( m_widget );
|
||||
|
||||
@@ -390,7 +390,7 @@ Config::currentTimezoneName() const
|
||||
{
|
||||
if ( m_currentLocation )
|
||||
{
|
||||
return m_regionModel->tr( m_currentLocation->region() ) + '/' + m_currentLocation->tr();
|
||||
return m_regionModel->translated( m_currentLocation->region() ) + '/' + m_currentLocation->translated();
|
||||
}
|
||||
return QString();
|
||||
}
|
||||
|
||||
@@ -144,7 +144,7 @@ TimeZoneWidget::paintEvent( QPaintEvent* )
|
||||
#else
|
||||
auto textwidth = [ & ]( const QString& s ) { return fontMetrics.width( s ); };
|
||||
#endif
|
||||
const int textWidth = textwidth( m_currentLocation ? m_currentLocation->tr() : QString() );
|
||||
const int textWidth = textwidth( m_currentLocation ? m_currentLocation->translated() : QString() );
|
||||
const int textHeight = fontMetrics.height();
|
||||
|
||||
QRect rect = QRect( point.x() - textWidth / 2 - 5, point.y() - textHeight - 8, textWidth + 10, textHeight - 2 );
|
||||
@@ -170,7 +170,7 @@ TimeZoneWidget::paintEvent( QPaintEvent* )
|
||||
painter.setBrush( QColor( 40, 40, 40 ) );
|
||||
painter.drawRoundedRect( rect, 3, 3 );
|
||||
painter.setPen( Qt::white );
|
||||
painter.drawText( rect.x() + 5, rect.bottom() - 4, m_currentLocation ? m_currentLocation->tr() : QString() );
|
||||
painter.drawText( rect.x() + 5, rect.bottom() - 4, m_currentLocation ? m_currentLocation->translated() : QString() );
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
419
src/modules/services-artix/main.py
Normal file
419
src/modules/services-artix/main.py
Normal file
@@ -0,0 +1,419 @@
|
||||
#!/usr/bin/env python3
|
||||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# === This file is part of Calamares - <https://calamares.io> ===
|
||||
#
|
||||
# SPDX-FileCopyrightText: 2016 Artoo <artoo@manjaro.org>
|
||||
# SPDX-FileCopyrightText: 2017 Philip Müller <philm@manjaro.org>
|
||||
# SPDX-FileCopyrightText: 2018 Artoo <artoo@artixlinux.org>
|
||||
# SPDX-FileCopyrightText: 2018-2019 Adriaan de Groot <groot@kde.org>
|
||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||
#
|
||||
# Calamares is Free Software: see the License-Identifier above.
|
||||
#
|
||||
|
||||
import libcalamares
|
||||
|
||||
from libcalamares.utils import target_env_call, warning
|
||||
from os.path import exists, join
|
||||
|
||||
|
||||
import gettext
|
||||
_ = gettext.translation("calamares-python",
|
||||
localedir=libcalamares.utils.gettext_path(),
|
||||
languages=libcalamares.utils.gettext_languages(),
|
||||
fallback=True).gettext
|
||||
|
||||
|
||||
def pretty_name():
|
||||
return _("Configure artix services")
|
||||
|
||||
# TODO: cleran up this merged mess, implement meta class
|
||||
class OpenrcController:
|
||||
"""
|
||||
This is the openrc service controller.
|
||||
All of its state comes from global storage and the job
|
||||
configuration at initialization time.
|
||||
"""
|
||||
|
||||
def __init__(self):
|
||||
self.root = libcalamares.globalstorage.value('rootMountPoint')
|
||||
|
||||
# Translate the entries in the config to the actions passed to rc-config
|
||||
self.services = dict()
|
||||
self.services["add"] = libcalamares.job.configuration.get('services', [])
|
||||
self.services["del"] = libcalamares.job.configuration.get('disable', [])
|
||||
|
||||
openrc = libcalamares.job.configuration.get('openrc', None)
|
||||
if openrc is None:
|
||||
openrc = dict()
|
||||
if type(openrc) is not dict:
|
||||
libcalamares.utils.warning("Job configuration *openrc* will be ignored.")
|
||||
openrc = dict()
|
||||
|
||||
self.openrc_initdDir = openrc.get('initdDir')
|
||||
self.openrc_runlevelsDir = openrc.get('runlevelsDir')
|
||||
|
||||
|
||||
def make_failure_description(self, state, name, runlevel):
|
||||
"""
|
||||
Returns a generic "could not <foo>" failure message, specialized
|
||||
for the action @p state and the specific service @p name in @p runlevel.
|
||||
"""
|
||||
if state == "add":
|
||||
description = _("Cannot add service {name!s} to run-level {level!s}.")
|
||||
elif state == "del":
|
||||
description = _("Cannot remove service {name!s} from run-level {level!s}.")
|
||||
else:
|
||||
description = _("Unknown service-action <code>{arg!s}</code> for service {name!s} in run-level {level!s}.")
|
||||
|
||||
return description.format(arg=state, name=name, level=runlevel)
|
||||
|
||||
|
||||
def update(self, state):
|
||||
"""
|
||||
Call rc-update for each service listed
|
||||
in services for the given @p state. rc-update
|
||||
is called with @p state as the command as well.
|
||||
"""
|
||||
|
||||
for svc in self.services.get(state, []):
|
||||
if isinstance(svc, str):
|
||||
name = svc
|
||||
runlevel = "default"
|
||||
mandatory = False
|
||||
else:
|
||||
name = svc["name"]
|
||||
runlevel = svc.get("runlevel", "default")
|
||||
mandatory = svc.get("mandatory", False)
|
||||
|
||||
service_path = self.root + self.openrc_initdDir + "/" + name
|
||||
runlevel_path = self.root + self.openrc_runlevelsDir + "/" + runlevel
|
||||
|
||||
if exists(service_path):
|
||||
if exists(runlevel_path):
|
||||
ec = target_env_call(["rc-update", state, name, runlevel])
|
||||
if ec != 0:
|
||||
warning("Cannot {} service {} to {}".format(state, name, runlevel))
|
||||
warning("rc-update returned error code {!s}".format(ec))
|
||||
if mandatory:
|
||||
title = _("Cannot modify service")
|
||||
diagnostic = _("<code>rc-update {arg!s}</code> call in chroot returned error code {num!s}.").format(arg=state, num=ec)
|
||||
return (title,
|
||||
self.make_failure_description(state, name, runlevel) + " " + diagnostic
|
||||
)
|
||||
else:
|
||||
warning("Target runlevel {} does not exist for {}.".format(runlevel, name))
|
||||
if mandatory:
|
||||
title = _("Target runlevel does not exist")
|
||||
diagnostic = _("The path for runlevel {level!s} is <code>{path!s}</code>, which does not exist.").format(level=runlevel, path=runlevel_path)
|
||||
|
||||
return (title,
|
||||
self.make_failure_description(state, name, runlevel) + " " + diagnostic
|
||||
)
|
||||
else:
|
||||
warning("Target service {} does not exist in {}.".format(name, self.openrc_initdDir))
|
||||
if mandatory:
|
||||
title = _("Target service does not exist")
|
||||
diagnostic = _("The path for service {name!s} is <code>{path!s}</code>, which does not exist.").format(name=name, path=service_path)
|
||||
return (title,
|
||||
self.make_failure_description(state, name, runlevel) + " " + diagnostic
|
||||
)
|
||||
|
||||
|
||||
def run(self):
|
||||
"""Run the controller
|
||||
"""
|
||||
|
||||
for state in ("add", "del"):
|
||||
r = self.update(state)
|
||||
if r is not None:
|
||||
return r
|
||||
|
||||
class S6Controller:
|
||||
"""
|
||||
This is the s6 service controller.
|
||||
All of its state comes from global storage and the job
|
||||
configuration at initialization time.
|
||||
"""
|
||||
|
||||
def __init__(self):
|
||||
self.root = libcalamares.globalstorage.value('rootMountPoint')
|
||||
|
||||
s6 = libcalamares.job.configuration.get('s6', None)
|
||||
if s6 is None:
|
||||
s6 = dict()
|
||||
if type(s6) is not dict:
|
||||
libcalamares.utils.warning("Job configuration *s6* will be ignored.")
|
||||
s6 = dict()
|
||||
|
||||
self.s6_dbDir = s6.get('dbDir')
|
||||
self.s6_defaultBundle = s6.get('defaultBundle')
|
||||
|
||||
self.services = dict()
|
||||
self.services["add"] = libcalamares.job.configuration.get('services', [])
|
||||
self.services["delete"] = libcalamares.job.configuration.get('disable', [])
|
||||
|
||||
|
||||
def makeBundle(self):
|
||||
"""
|
||||
Call s6-rc-bundle with each service listed
|
||||
in services as arg.
|
||||
"""
|
||||
|
||||
deleteBundles = self.services.get("delete", [])
|
||||
|
||||
if deleteBundles:
|
||||
ec = target_env_call(["s6-rc-bundle", "-c", self.s6_dbDir, "delete", *deleteBundles])
|
||||
if ec != 0:
|
||||
warning("Cannot delete {}".format(*deleteBundles))
|
||||
warning("s6-rc-bundle returned error code {!s}".format(ec))
|
||||
|
||||
for svc in self.services.get('add', []):
|
||||
ec = target_env_call(["s6-rc-db", "-c", self.s6_dbDir, "type", svc])
|
||||
if ec != 0:
|
||||
warning("Service {} does not exist.".format(svc))
|
||||
warning("s6-rc-db returned error code {!s}".format(ec))
|
||||
else:
|
||||
ec = target_env_call(["s6-service", "add", self.s6_defaultBundle, svc])
|
||||
if ec != 0:
|
||||
warning("Cannot add service {} to {} bundle".format(svc, self.s6_defaultBundle))
|
||||
warning("s6-service returned error code {!s}".format(ec))
|
||||
|
||||
ec = target_env_call(["s6-db-reload", "-r"])
|
||||
if ec != 0:
|
||||
warning("Cannot reload service db.")
|
||||
warning("s6-db-reload returned error code {!s}".format(ec))
|
||||
|
||||
def run(self):
|
||||
"""Run the controller
|
||||
"""
|
||||
|
||||
r = self.makeBundle()
|
||||
if r is not None:
|
||||
return r
|
||||
|
||||
class DinitController:
|
||||
"""
|
||||
This is the dinit service controller.
|
||||
All of its state comes from global storage and the job
|
||||
configuration at initialization time.
|
||||
"""
|
||||
|
||||
def __init__(self):
|
||||
self.root = libcalamares.globalstorage.value('rootMountPoint')
|
||||
|
||||
# Translate the entries in the config to the actions passed to sv-helper
|
||||
self.services = dict()
|
||||
self.services["enable"] = libcalamares.job.configuration.get('services', [])
|
||||
self.services["disable"] = libcalamares.job.configuration.get('disable', [])
|
||||
|
||||
dinit = libcalamares.job.configuration.get('dinit', None)
|
||||
if dinit is None:
|
||||
dinit = dict()
|
||||
if type(dinit) is not dict:
|
||||
libcalamares.utils.warning("Job configuration *dinit* will be ignored.")
|
||||
dinit = dict()
|
||||
|
||||
self.dinit_initdDir = dinit.get('initdDir')
|
||||
self.dinit_runsvDir = dinit.get('runsvDir')
|
||||
|
||||
|
||||
def make_failure_description(self, state, name):
|
||||
"""
|
||||
Returns a generic "could not <foo>" failure message, specialized
|
||||
for the action @p state and the specific service @p name.
|
||||
"""
|
||||
if state == "enable":
|
||||
description = _("Cannot enable service {name!s}.")
|
||||
elif state == "disable":
|
||||
description = _("Cannot disable service {name!s}.")
|
||||
else:
|
||||
description = _("Unknown service-action <code>{arg!s}</code> for service {name!s}.")
|
||||
|
||||
return description.format(arg=state, name=name)
|
||||
|
||||
|
||||
def update(self, state):
|
||||
"""
|
||||
Process each service listed
|
||||
in services for the given @p state.
|
||||
"""
|
||||
|
||||
for svc in self.services.get(state, []):
|
||||
if isinstance(svc, str):
|
||||
name = svc
|
||||
mandatory = False
|
||||
else:
|
||||
name = svc["name"]
|
||||
mandatory = svc.get("mandatory", False)
|
||||
|
||||
service_path = self.root + self.dinit_initdDir + "/" + name
|
||||
runlevel_path = self.root + self.dinit_runsvDir
|
||||
src = self.dinit_initdDir + "/" + name
|
||||
dest = self.dinit_runsvDir + "/"
|
||||
|
||||
if state == 'enable':
|
||||
cmd = ["ln", "-sv", src, dest]
|
||||
elif state == 'disable':
|
||||
cmd = ["rm", "-rv", dest]
|
||||
|
||||
if exists(service_path):
|
||||
if exists(runlevel_path):
|
||||
ec = target_env_call(cmd)
|
||||
if ec != 0:
|
||||
warning("Cannot {} service {}".format(state, name))
|
||||
warning("{} returned error code {!s}".format(cmd, ec))
|
||||
if mandatory:
|
||||
title = _("Cannot modify service")
|
||||
diagnostic = _("<code>cmd {arg!s}</code> call in chroot returned error code {num!s}.").format(arg=state, num=ec)
|
||||
return (title,
|
||||
self.make_failure_description(state, name) + " " + diagnostic
|
||||
)
|
||||
else:
|
||||
warning("Target service {} does not exist in {}.".format(name, self.dinit_initdDir))
|
||||
if mandatory:
|
||||
title = _("Target service does not exist")
|
||||
diagnostic = _("The path for service {name!s} is <code>{path!s}</code>, which does not exist.").format(name=name, path=service_path)
|
||||
return (title,
|
||||
self.make_failure_description(state, name) + " " + diagnostic
|
||||
)
|
||||
|
||||
|
||||
def run(self):
|
||||
"""Run the controller
|
||||
"""
|
||||
|
||||
for state in ("enable", "disable"):
|
||||
r = self.update(state)
|
||||
if r is not None:
|
||||
return r
|
||||
|
||||
class RunitController:
|
||||
"""
|
||||
This is the runit service controller.
|
||||
All of its state comes from global storage and the job
|
||||
configuration at initialization time.
|
||||
"""
|
||||
|
||||
def __init__(self):
|
||||
self.root = libcalamares.globalstorage.value('rootMountPoint')
|
||||
|
||||
# Translate the entries in the config to the actions passed to sv-helper
|
||||
self.services = dict()
|
||||
self.services["enable"] = libcalamares.job.configuration.get('services', [])
|
||||
self.services["disable"] = libcalamares.job.configuration.get('disable', [])
|
||||
|
||||
runit = libcalamares.job.configuration.get('runit', None)
|
||||
if runit is None:
|
||||
runit = dict()
|
||||
if type(runit) is not dict:
|
||||
libcalamares.utils.warning("Job configuration *runit* will be ignored.")
|
||||
runit = dict()
|
||||
|
||||
self.runit_svDir = libcalamares.job.configuration['svDir']
|
||||
self.runit_runsvDir = libcalamares.job.configuration['runsvDir']
|
||||
|
||||
|
||||
def make_failure_description(self, state, name, runlevel):
|
||||
"""
|
||||
Returns a generic "could not <foo>" failure message, specialized
|
||||
for the action @p state and the specific service @p name in @p runlevel.
|
||||
"""
|
||||
if state == "enable":
|
||||
description = _("Cannot enable service {name!s} to run-level {level!s}.")
|
||||
elif state == "disable":
|
||||
description = _("Cannot disable service {name!s} from run-level {level!s}.")
|
||||
else:
|
||||
description = _("Unknown service-action <code>{arg!s}</code> for service {name!s} in run-level {level!s}.")
|
||||
|
||||
return description.format(arg=state, name=name, level=runlevel)
|
||||
|
||||
|
||||
def update(self, state):
|
||||
"""
|
||||
Call sv-helper for each service listed
|
||||
in services for the given @p state.
|
||||
"""
|
||||
|
||||
for svc in self.services.get(state, []):
|
||||
if isinstance(svc, str):
|
||||
name = svc
|
||||
runlevel = "default"
|
||||
mandatory = False
|
||||
else:
|
||||
name = svc["name"]
|
||||
runlevel = svc.get("runlevel", "default")
|
||||
mandatory = svc.get("mandatory", False)
|
||||
|
||||
service_path = self.root + self.runit_svDir + "/" + name
|
||||
runlevel_path = self.root + self.runit_runsvDir + "/" + runlevel
|
||||
src = self.runit_svDir + "/" + name
|
||||
dest = self.runit_runsvDir + "/" + runlevel + "/"
|
||||
|
||||
if state == 'enable':
|
||||
cmd = ["ln", "-sv", src, dest]
|
||||
elif state == 'disable':
|
||||
cmd = ["rm", "-rv", dest]
|
||||
|
||||
if exists(service_path):
|
||||
if exists(runlevel_path):
|
||||
ec = target_env_call(cmd)
|
||||
if ec != 0:
|
||||
warning("Cannot {} service {} to {}".format(state, name, runlevel))
|
||||
warning("{} returned error code {!s}".format(cmd, ec))
|
||||
if mandatory:
|
||||
title = _("Cannot modify service")
|
||||
diagnostic = _("<code>cmd {arg!s}</code> call in chroot returned error code {num!s}.").format(arg=state, num=ec)
|
||||
return (title,
|
||||
self.make_failure_description(state, name, runlevel) + " " + diagnostic
|
||||
)
|
||||
else:
|
||||
warning("Target runlevel {} does not exist for {}.".format(runlevel, name))
|
||||
if mandatory:
|
||||
title = _("Target runlevel does not exist")
|
||||
diagnostic = _("The path for runlevel {level!s} is <code>{path!s}</code>, which does not exist.").format(level=runlevel, path=runlevel_path)
|
||||
|
||||
return (title,
|
||||
self.make_failure_description(state, name, runlevel) + " " + diagnostic
|
||||
)
|
||||
else:
|
||||
warning("Target service {} does not exist in {}.".format(name, self.svDir))
|
||||
if mandatory:
|
||||
title = _("Target service does not exist")
|
||||
diagnostic = _("The path for service {name!s} is <code>{path!s}</code>, which does not exist.").format(name=name, path=service_path)
|
||||
return (title,
|
||||
self.make_failure_description(state, name, runlevel) + " " + diagnostic
|
||||
)
|
||||
|
||||
|
||||
def run(self):
|
||||
"""Run the controller
|
||||
"""
|
||||
|
||||
for state in ("enable", "disable"):
|
||||
r = self.update(state)
|
||||
if r is not None:
|
||||
return r
|
||||
|
||||
def run():
|
||||
"""
|
||||
Setup services
|
||||
"""
|
||||
if libcalamares.globalstorage.contains("initProvider"):
|
||||
init_provider = libcalamares.globalstorage.value("initProvider")
|
||||
|
||||
match init_provider:
|
||||
case 'openrc':
|
||||
return OpenrcController().run()
|
||||
case's6':
|
||||
return S6Controller().run()
|
||||
case 'dinit':
|
||||
return DinitController().run()
|
||||
case 'runit':
|
||||
return RunitController().run()
|
||||
case _:
|
||||
return None
|
||||
|
||||
|
||||
|
||||
7
src/modules/services-artix/module.desc
Normal file
7
src/modules/services-artix/module.desc
Normal file
@@ -0,0 +1,7 @@
|
||||
# SPDX-FileCopyrightText: no
|
||||
# SPDX-License-Identifier: CC0-1.0
|
||||
---
|
||||
type: "job"
|
||||
name: "services-artix"
|
||||
interface: "python"
|
||||
script: "main.py"
|
||||
68
src/modules/services-artix/services-artix.conf
Normal file
68
src/modules/services-artix/services-artix.conf
Normal file
@@ -0,0 +1,68 @@
|
||||
# SPDX-FileCopyrightText: no
|
||||
# SPDX-License-Identifier: CC0-1.0
|
||||
#
|
||||
# openrc services module to modify service runlevels via rc-update in the chroot
|
||||
#
|
||||
# Services can be added (to any runlevel, or multiple runlevels) or deleted.
|
||||
# Handle del with care and only use it if absolutely necessary.
|
||||
#
|
||||
# if a service is listed in the conf but is not present/detected on the target system,
|
||||
# or a runlevel does not exist, it will be ignored and skipped; a warning is logged.
|
||||
#
|
||||
---
|
||||
|
||||
openrc:
|
||||
# initdDir: holds the openrc service directory location
|
||||
initdDir: /etc/init.d
|
||||
# runlevelsDir: holds the runlevels directory location
|
||||
runlevelsDir: /etc/runlevels
|
||||
|
||||
dinit:
|
||||
# initdDir: holds the runit service directory location
|
||||
initdDir: /etc/dinit.d
|
||||
# runsvDir: holds the runlevels directory location
|
||||
runsvDir: /etc/dinit.d/boot.d
|
||||
|
||||
runit:
|
||||
# svDir: holds the runit service directory location
|
||||
svDir: /etc/runit/sv
|
||||
# runsvDir: holds the runlevels directory location
|
||||
runsvDir: /etc/runit/runsvdir
|
||||
|
||||
s6:
|
||||
# database path
|
||||
dbDir: /etc/s6/rc/compiled
|
||||
# default bundle name
|
||||
defaultBundle: default
|
||||
|
||||
# services: a list of entries to **enable**
|
||||
# disable: a list of entries to **disable**
|
||||
#
|
||||
# Each entry has three fields:
|
||||
# - name: the service name
|
||||
# - (optional) runlevel: can hold any runlevel present on the target
|
||||
# system; if no runlevel is provided, "default" is assumed.
|
||||
# - (optional) mandatory: if set to true, a failure to modify
|
||||
# the service will result in installation failure, rather than just
|
||||
# a warning. The default is false.
|
||||
#
|
||||
# an entry may also be a single string, which is interpreted
|
||||
# as the name field (runlevel "default" is assumed then, and not-mandatory).
|
||||
#
|
||||
# # Example services and disable settings:
|
||||
# # - add foo1 to default, but it must succeed
|
||||
# # - add foo2 to nonetwork
|
||||
# # - remove foo3 from default
|
||||
# # - remove foo4 from default
|
||||
# services:
|
||||
# - name: foo1
|
||||
# mandatory: true
|
||||
# - name: foo2
|
||||
# runlevel: nonetwork
|
||||
# disable:
|
||||
# - name: foo3
|
||||
# runlevel: default
|
||||
# - foo4
|
||||
services: []
|
||||
disable: []
|
||||
|
||||
Reference in New Issue
Block a user