From 951ddfb72a89b4fe656a8000250202483d24d92d Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 1 Dec 2021 23:06:02 +0100 Subject: [PATCH 01/99] [mount] Experimental: accept 'no' for subvolumes If there is no subvolume set, skip creation of that subvolume. This allows root to be on a bare FS, without a tag or subvolume name. To achieve this, use subvolume: no (no quotes there) in the YAML. --- src/modules/mount/main.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py index 900342e6d..f186b0d26 100644 --- a/src/modules/mount/main.py +++ b/src/modules/mount/main.py @@ -191,6 +191,8 @@ def mount_partition(root_mount_point, partition, partitions): libcalamares.globalstorage.insert("btrfsSubvolumes", btrfs_subvolumes) # Create the subvolumes that are in the completed list for s in btrfs_subvolumes: + if not s["subvolume"]: + continue subprocess.check_call(["btrfs", "subvolume", "create", root_mount_point + s["subvolume"]]) if s["mountPoint"] == "/": From 96ccf256b207fa3f41dae816d31b4686b492ec1c Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 2 Dec 2021 22:02:14 +0100 Subject: [PATCH 02/99] [mount] Add documentation to the config file --- src/modules/mount/mount.conf | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/modules/mount/mount.conf b/src/modules/mount/mount.conf index 6168e97cc..84dca05a7 100644 --- a/src/modules/mount/mount.conf +++ b/src/modules/mount/mount.conf @@ -42,15 +42,24 @@ extraMountsEfi: mountPoint: /sys/firmware/efi/efivars # Btrfs subvolumes to create if root filesystem is on btrfs volume. -# If mountpoint is mounted already to another partition, it is ignored. +# If *mountpoint* is mounted already to another partition, it is ignored. # Separate subvolume for swapfile is handled separately and automatically. +# +# It is possible to prevent subvolume creation -- this is likely only relevant +# for the root (/) subvolume -- by giving an empty string as a subvolume +# name. In this case no subvolume will be created. When using snapper as +# a rollback mechanism, it is recommended to **not** create a subvolume +# for root. btrfsSubvolumes: - mountPoint: / subvolume: /@ + # As an alternative: + # + # subvolume: "" - mountPoint: /home subvolume: /@home - mountPoint: /var/cache subvolume: /@cache - mountPoint: /var/log - subvolume: /@log \ No newline at end of file + subvolume: /@log From f26c81700d7c34b5411038acd245ef797f95fdd6 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 2 Dec 2021 22:08:17 +0100 Subject: [PATCH 03/99] [fstab] Suppress empty subvol= options in fstab --- src/modules/fstab/main.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/fstab/main.py b/src/modules/fstab/main.py index 261d3cadb..426761453 100644 --- a/src/modules/fstab/main.py +++ b/src/modules/fstab/main.py @@ -258,7 +258,8 @@ class FstabGenerator(object): if mount_point == "/": self.root_is_ssd = is_ssd - if filesystem == "btrfs" and "subvol" in partition: + # If there's a set-and-not-empty subvolume set, add it + if filesystem == "btrfs" and partition.get("subvol",None): options = "subvol={},".format(partition["subvol"]) + options if has_luks: From 209c48d67f6e1f85542adf0f2c679f1341133c92 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Fri, 3 Dec 2021 23:30:27 +0100 Subject: [PATCH 04/99] i18n: [calamares] Automatic merge of Transifex translations --- lang/calamares_pt_BR.ts | 10 +++++----- lang/calamares_pt_PT.ts | 8 ++++---- lang/calamares_ru.ts | 10 +++++----- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lang/calamares_pt_BR.ts b/lang/calamares_pt_BR.ts index 435f398e4..517a84b3a 100644 --- a/lang/calamares_pt_BR.ts +++ b/lang/calamares_pt_BR.ts @@ -689,27 +689,27 @@ O instalador será fechado e todas as alterações serão perdidas. Successfully unmounted %1. - + %1 desmontado com sucesso. Successfully disabled swap %1. - + Swap %1 desativada com sucesso. Successfully cleared swap %1. - + Swap %1 limpa com sucesso. Successfully closed mapper device %1. - + Dispositivo de mapeamento %1 fechado com sucesso. Successfully disabled volume group %1. - + Grupo de volume %1 desativado com sucesso. diff --git a/lang/calamares_pt_PT.ts b/lang/calamares_pt_PT.ts index dbbc088a9..951645ab1 100644 --- a/lang/calamares_pt_PT.ts +++ b/lang/calamares_pt_PT.ts @@ -789,7 +789,7 @@ O instalador será encerrado e todas as alterações serão perdidas. The system language will be set to %1. - A linguagem do sistema será definida para %1. + O idioma do sistema será definido para %1. @@ -1684,7 +1684,7 @@ O instalador será encerrado e todas as alterações serão perdidas. Collecting information about your machine. - A recolher informação acerca da sua máquina. + A recolher informação sobre a sua máquina. @@ -3988,7 +3988,7 @@ Saída de Dados: %1 support - %1 suporte + Suporte do %1 @@ -3998,7 +3998,7 @@ Saída de Dados: About %1 installer - Acerca %1 instalador + Acerca do instalador %1 diff --git a/lang/calamares_ru.ts b/lang/calamares_ru.ts index 712662224..c722e2359 100644 --- a/lang/calamares_ru.ts +++ b/lang/calamares_ru.ts @@ -189,7 +189,7 @@ Run command '%1' in target system. - Запустить комманду'%1'в целевой системе. + Запустить команду '%1' в целевой системе. @@ -274,10 +274,10 @@ (%n second(s)) - (% секунда) - (% секунд) - (% секунд) + (%n секунда) + (%n секунды) (%n секунд) + (%n секунд(ы)) @@ -2673,7 +2673,7 @@ The installer will quit and all changes will be lost. EFI system - Система EFI + Системный раздел EFI From 0178fe6782af7ea8afcda931822e986e1cb3350b Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Fri, 3 Dec 2021 23:30:27 +0100 Subject: [PATCH 05/99] i18n: [desktop] Automatic merge of Transifex translations --- calamares.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calamares.desktop b/calamares.desktop index 761a7db01..bfe3955b1 100644 --- a/calamares.desktop +++ b/calamares.desktop @@ -236,7 +236,7 @@ Comment[es_MX]=Calamares - Instalador del sistema Name[pt_PT]=Instalar Sistema Icon[pt_PT]=calamares GenericName[pt_PT]=Instalador de Sistema -Comment[pt_PT]=Calamares - Instalador de Sistema +Comment[pt_PT]=Instalador de Sistema - Calamares Name[tr_TR]=Sistemi Yükle Icon[tr_TR]=calamares GenericName[tr_TR]=Sistem Yükleyici From 5b767e147decb1d6180b27340f07780b0c747652 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Fri, 3 Dec 2021 23:30:28 +0100 Subject: [PATCH 06/99] i18n: [python] Automatic merge of Transifex translations --- lang/python/pt_BR/LC_MESSAGES/python.po | 4 +++- lang/python/vi/LC_MESSAGES/python.po | 7 +++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lang/python/pt_BR/LC_MESSAGES/python.po b/lang/python/pt_BR/LC_MESSAGES/python.po index d3cf730a0..f8f3e8ca7 100644 --- a/lang/python/pt_BR/LC_MESSAGES/python.po +++ b/lang/python/pt_BR/LC_MESSAGES/python.po @@ -330,7 +330,7 @@ msgstr "Não é possível habilitar o alvo {name!s} do systemd." #: src/modules/services-systemd/main.py:67 msgid "Cannot enable systemd timer {name!s}." -msgstr "" +msgstr "Não foi possível ativar o cronômetro systemd {name!s}." #: src/modules/services-systemd/main.py:71 msgid "Cannot disable systemd target {name!s}." @@ -410,6 +410,8 @@ msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed." msgstr "" +"Não foi possível encontrar o unsquashfs, certifique-se de que o pacote " +"squashfs-tools foi instalado." #: src/modules/unpackfs/main.py:479 msgid "The destination \"{}\" in the target system is not a directory" diff --git a/lang/python/vi/LC_MESSAGES/python.po b/lang/python/vi/LC_MESSAGES/python.po index 83928edd6..900b99454 100644 --- a/lang/python/vi/LC_MESSAGES/python.po +++ b/lang/python/vi/LC_MESSAGES/python.po @@ -5,6 +5,7 @@ # # Translators: # T. Tran , 2020 +# Th1nhhdk, 2021 # #, fuzzy msgid "" @@ -13,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-11-02 15:45+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: T. Tran , 2020\n" +"Last-Translator: Th1nhhdk, 2021\n" "Language-Team: Vietnamese (https://www.transifex.com/calamares/teams/20061/vi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -61,13 +62,15 @@ msgstr "Đang cài đặt bộ khởi động." #: src/modules/bootloader/main.py:508 msgid "Bootloader installation error" -msgstr "" +msgstr "Lỗi cài đặt trình khởi động(bootloader)" #: src/modules/bootloader/main.py:509 msgid "" "The bootloader could not be installed. The installation command " "
{!s}
returned error code {!s}." msgstr "" +"Trình khởi động(bootloader) không thể được cài đặt. Lệnh cài đặt " +"
{!s}
đã trả mã lỗi {!s}." #: src/modules/fstab/main.py:29 msgid "Writing fstab." From 5277892e4f9a4bc0d0b098ff3b526e3421cc6a02 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 3 Dec 2021 23:47:16 +0100 Subject: [PATCH 07/99] Changes: pre-release housekeeping --- CHANGES-3.2 | 5 ++++- CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGES-3.2 b/CHANGES-3.2 index 9f60e0ab8..baaf261d4 100644 --- a/CHANGES-3.2 +++ b/CHANGES-3.2 @@ -7,7 +7,7 @@ contributors are listed. Note that Calamares does not have a historical changelog -- this log starts with version 3.2.0. The release notes on the website will have to do for older versions. -# 3.2.48 (unreleased) # +# 3.2.48 (2021-12-03) # This release contains contributions from (alphabetically by first name): - Evan James @@ -23,6 +23,9 @@ This release contains contributions from (alphabetically by first name): - *fstab* now has a separate, special, flags-setting for swap subvolumes on btrfs. A swap subvolume is created if a swap **file** (not a separate partition) is selected in the auto-partitioning page. (Thanks Evan) + - When using btrfs, the *mount* module creates subvolumes. It was not + possible to **avoid** having a subvolume name created for the root. + This is now possible. #1837 - The *packages* module now has some special settings for the `pacman` package manager (generally used on Arch-derivatives). This allows tweaking of the installation process, if downloads are slow or diff --git a/CMakeLists.txt b/CMakeLists.txt index bd4d3eb3a..c998d43d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,7 +45,7 @@ project( CALAMARES LANGUAGES C CXX ) -set( CALAMARES_VERSION_RC 1 ) # Set to 0 during release cycle, 1 during development +set( CALAMARES_VERSION_RC 0 ) # Set to 0 during release cycle, 1 during development if( CALAMARES_VERSION_RC EQUAL 1 AND CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR ) message( FATAL_ERROR "Do not build development versions in the source-directory." ) endif() From c22bbea5281d65674ad271ee95dea05d6f24600a Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 4 Dec 2021 02:04:24 +0100 Subject: [PATCH 08/99] [packages] Fix tests; YAML interpretation of 'yes' is not a bool --- src/modules/packages/tests/pm-pacman-1.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/packages/tests/pm-pacman-1.yaml b/src/modules/packages/tests/pm-pacman-1.yaml index e876bd0fe..aeb5b8625 100644 --- a/src/modules/packages/tests/pm-pacman-1.yaml +++ b/src/modules/packages/tests/pm-pacman-1.yaml @@ -5,6 +5,6 @@ operations: [] pacman: num_retries: 4 - disable_download_timeout: yes + disable_download_timeout: true needed_only: true From ceb9ec4115e9038b1faa0869fe4d1e6c1034f008 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 4 Dec 2021 02:15:33 +0100 Subject: [PATCH 09/99] [fstab] Avoid KeyError when no subvol is set (from dalto8) --- src/modules/fstab/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/fstab/main.py b/src/modules/fstab/main.py index 426761453..6a771a24b 100644 --- a/src/modules/fstab/main.py +++ b/src/modules/fstab/main.py @@ -237,7 +237,7 @@ class FstabGenerator(object): return None # If this is btrfs subvol a dedicated to a swapfile, use different options than a normal btrfs subvol - if filesystem == "btrfs" and partition["subvol"] == "/@swap": + if filesystem == "btrfs" and partition.get("subvol", None) == "/@swap": options = self.get_mount_options("btrfs_swap", mount_point) else: options = self.get_mount_options(filesystem, mount_point) From 6e8779cbce44e282f3f9d8de09bd75a3b37495ae Mon Sep 17 00:00:00 2001 From: dalto Date: Sat, 4 Dec 2021 08:53:15 -0600 Subject: [PATCH 10/99] [mount] Ensure path is available when creating nested btrfs subvolumes --- src/modules/mount/main.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py index f186b0d26..a3318d1a0 100644 --- a/src/modules/mount/main.py +++ b/src/modules/mount/main.py @@ -193,6 +193,7 @@ def mount_partition(root_mount_point, partition, partitions): for s in btrfs_subvolumes: if not s["subvolume"]: continue + os.makedirs(root_mount_point + os.path.dirname(s["subvolume"]), exist_ok=True) subprocess.check_call(["btrfs", "subvolume", "create", root_mount_point + s["subvolume"]]) if s["mountPoint"] == "/": From 1d96c5af4615d17fdc744538bcf31b62d8f04ea2 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 5 Dec 2021 01:32:51 +0100 Subject: [PATCH 11/99] [partition] Table type 'none' is a late addition. --- src/modules/partition/gui/DeviceInfoWidget.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/modules/partition/gui/DeviceInfoWidget.cpp b/src/modules/partition/gui/DeviceInfoWidget.cpp index 05a8c4b63..39d9413e1 100644 --- a/src/modules/partition/gui/DeviceInfoWidget.cpp +++ b/src/modules/partition/gui/DeviceInfoWidget.cpp @@ -100,7 +100,9 @@ DeviceInfoWidget::retranslateUi() "that makes a file accessible as a block device. " "This kind of setup usually only contains a single filesystem." ); break; +#if defined( WITH_KPMCORE42API ) case PartitionTable::none: +#endif case PartitionTable::unknownTableType: typeString = " ? "; toolTipString = tr( "This installer cannot detect a partition table on the " From 6bf0da7230260ddcf3f6afd6ec5820da87bb466c Mon Sep 17 00:00:00 2001 From: Artem Grinev Date: Sun, 5 Dec 2021 04:50:13 +0400 Subject: [PATCH 12/99] [libcalamaresui] Initial rework of error dialog --- src/libcalamaresui/CMakeLists.txt | 3 + src/libcalamaresui/ViewManager.cpp | 47 ++----- .../utils/ErrorDialog/ErrorDialog.cpp | 89 +++++++++++++ .../utils/ErrorDialog/ErrorDialog.h | 57 +++++++++ .../utils/ErrorDialog/ErrorDialog.ui | 120 ++++++++++++++++++ 5 files changed, 282 insertions(+), 34 deletions(-) create mode 100644 src/libcalamaresui/utils/ErrorDialog/ErrorDialog.cpp create mode 100644 src/libcalamaresui/utils/ErrorDialog/ErrorDialog.h create mode 100644 src/libcalamaresui/utils/ErrorDialog/ErrorDialog.ui diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt index a704b7484..e745681f3 100644 --- a/src/libcalamaresui/CMakeLists.txt +++ b/src/libcalamaresui/CMakeLists.txt @@ -20,6 +20,7 @@ set( calamaresui_SOURCES utils/CalamaresUtilsGui.cpp utils/ImageRegistry.cpp utils/Paste.cpp + utils/ErrorDialog/ErrorDialog.cpp viewpages/BlankViewStep.cpp viewpages/ExecutionViewStep.cpp @@ -75,6 +76,8 @@ calamares_add_library( calamaresui Qt5::Svg RESOURCES libcalamaresui.qrc EXPORT Calamares + UI + utils/ErrorDialog/ErrorDialog.ui VERSION ${CALAMARES_VERSION_SHORT} ) target_link_libraries( calamaresui PRIVATE yamlcpp::yamlcpp ) diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index 57570ad64..ee521a02c 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -25,6 +25,7 @@ #include "viewpages/ExecutionViewStep.h" #include "viewpages/ViewStep.h" #include "widgets/TranslationFix.h" +#include "utils/ErrorDialog/ErrorDialog.h" #include #include @@ -32,6 +33,7 @@ #include #include #include +#include #define UPDATE_BUTTON_PROPERTY( name, value ) \ do \ @@ -159,44 +161,21 @@ ViewManager::onInstallationFailed( const QString& message, const QString& detail cDebug() << Logger::SubEntry << "- details:" << Logger::NoQuote << details; QString heading - = Calamares::Settings::instance()->isSetupMode() ? tr( "Setup Failed" ) : tr( "Installation Failed" ); - QString pasteMsg = tr( "Would you like to paste the install log to the web?" ); - QString text = "

" + message + "

"; - if ( !details.isEmpty() ) - { - text += "

" - + CalamaresUtils::truncateMultiLine( details, CalamaresUtils::LinesStartEnd { 6, 2 } ) - .replace( '\n', QStringLiteral( "
" ) ) - + "

"; - } - if ( shouldOfferWebPaste ) - { - text += "

" + pasteMsg + "

"; - } + = Calamares::Settings::instance()->isSetupMode() ? tr( "Setup Failed" ) : tr( "Installation Failed" ); - QMessageBox* msgBox = new QMessageBox(); - msgBox->setIcon( QMessageBox::Critical ); - msgBox->setWindowTitle( tr( "Error" ) ); - msgBox->setText( "" + heading + "" ); - msgBox->setInformativeText( text ); - if ( shouldOfferWebPaste ) - { - msgBox->setStandardButtons( QMessageBox::Yes | QMessageBox::No ); - msgBox->setDefaultButton( QMessageBox::No ); - } - else - { - msgBox->setStandardButtons( QMessageBox::Close ); - msgBox->setDefaultButton( QMessageBox::Close ); - } - Calamares::fixButtonLabels( msgBox ); - msgBox->show(); + ErrorDialog* errorDialog = new ErrorDialog(); + errorDialog->setWindowTitle( tr( "Error" ) ); + errorDialog->setHeading( "" + heading + "" ); + errorDialog->setInformativeText( message ); + errorDialog->setShouldOfferWebPaste(shouldOfferWebPaste); + errorDialog->setDetails(details); + errorDialog->show(); cDebug() << "Calamares will quit when the dialog closes."; - connect( msgBox, &QMessageBox::buttonClicked, [msgBox]( QAbstractButton* button ) { - if ( msgBox->buttonRole( button ) == QMessageBox::ButtonRole::YesRole ) + connect( errorDialog, &QDialog::finished, [errorDialog]( int result ) { + if ( result == QDialog::Accepted && errorDialog->shouldOfferWebPaste() ) { - CalamaresUtils::Paste::doLogUploadUI( msgBox ); + CalamaresUtils::Paste::doLogUploadUI( errorDialog ); } QApplication::quit(); } ); diff --git a/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.cpp b/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.cpp new file mode 100644 index 000000000..080ff2115 --- /dev/null +++ b/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.cpp @@ -0,0 +1,89 @@ +#include "ErrorDialog.h" +#include "ui_ErrorDialog.h" + +#include +#include + +namespace Calamares { + + +ErrorDialog::ErrorDialog(QWidget *parent) : + QDialog(parent), + ui(new Ui::ErrorDialog) +{ + ui->setupUi(this); + ui->iconLabel->setPixmap(QIcon::fromTheme("dialog-error").pixmap(64)); + ui->detailsWidget->hide(); + ui->offerWebPasteLabel->hide(); +} + +ErrorDialog::~ErrorDialog() +{ + delete ui; +} + + +QString ErrorDialog::heading() const +{ + return ui->headingLabel->text(); +} + +QString ErrorDialog::informativeText() const +{ + return ui->informativeTextLabel->text(); +} + +QString ErrorDialog::details() const +{ + return ui->detailsBrowser->toPlainText(); +} + +void ErrorDialog::setHeading(const QString &newHeading) +{ + if (ui->headingLabel->text() == newHeading) + return; + ui->headingLabel->setText(newHeading); + emit headingChanged(); +} + +void ErrorDialog::setInformativeText(const QString &newInformativeText) +{ + if (ui->informativeTextLabel->text() == newInformativeText) + return; + ui->informativeTextLabel->setText(newInformativeText); + emit informativeTextChanged(); +} + +void ErrorDialog::setDetails(const QString &newDetails) +{ + if (ui->detailsBrowser->toPlainText() == newDetails) + return; + ui->detailsBrowser->setPlainText(newDetails); + + ui->detailsWidget->setVisible(!ui->detailsBrowser->toPlainText().trimmed().isEmpty()); + + emit detailsChanged(); +} + +bool ErrorDialog::shouldOfferWebPaste() const +{ + return m_shouldOfferWebPaste; +} + +void ErrorDialog::setShouldOfferWebPaste(bool newShouldOfferWebPaste) +{ + if (m_shouldOfferWebPaste == newShouldOfferWebPaste) + return; + m_shouldOfferWebPaste = newShouldOfferWebPaste; + + ui->offerWebPasteLabel->setVisible(m_shouldOfferWebPaste); + + ui->buttonBox->setStandardButtons( m_shouldOfferWebPaste + ? (QDialogButtonBox::Yes | QDialogButtonBox::No) + : QDialogButtonBox::Close ); + + + emit shouldOfferWebPasteChanged(); +} + +} // namespace Calamares diff --git a/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.h b/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.h new file mode 100644 index 000000000..8962c3e99 --- /dev/null +++ b/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.h @@ -0,0 +1,57 @@ +#ifndef ERRORDIALOG_H +#define ERRORDIALOG_H + +#include + + +namespace Ui { +class ErrorDialog; +} +class QDialogButtonBox; +namespace Calamares +{ +class ErrorDialog : public QDialog +{ + Q_OBJECT + + Q_PROPERTY(QString heading READ heading WRITE setHeading NOTIFY headingChanged) + Q_PROPERTY(QString informativeText READ informativeText WRITE setInformativeText NOTIFY informativeTextChanged) + Q_PROPERTY(QString details READ details WRITE setDetails NOTIFY detailsChanged) + Q_PROPERTY(bool shouldOfferWebPaste READ shouldOfferWebPaste WRITE setShouldOfferWebPaste NOTIFY shouldOfferWebPasteChanged) + +public: + explicit ErrorDialog(QWidget *parent = nullptr); + ~ErrorDialog(); + + QString heading() const; + + QString informativeText() const; + + QString details() const; + + void setHeading(const QString &newHeading); + + void setInformativeText(const QString &newInformativeText); + + void setDetails(const QString &newDetails); + + bool shouldOfferWebPaste() const; + void setShouldOfferWebPaste(bool newShouldOfferWebPaste); + +signals: + void headingChanged(); + + void informativeTextChanged(); + + void detailsChanged(); + + void shouldOfferWebPasteChanged(); + +private: + Ui::ErrorDialog *ui; + bool m_shouldOfferWebPaste; +}; + +}; // namespace Calamares + +#endif // ERRORDIALOG_H diff --git a/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.ui b/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.ui new file mode 100644 index 000000000..2632af617 --- /dev/null +++ b/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.ui @@ -0,0 +1,120 @@ + + + ErrorDialog + + + + 0 + 0 + 425 + 262 + + + + Dialog + + + + + + + 0 + 0 + + + + + + + + + + + + + + Details: + + + + + + + + + + + + + + 0 + 0 + + + + + + + + + + + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Close + + + + + + + Would you like to paste the install log to the web? + + + + + + + + + buttonBox + accepted() + ErrorDialog + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + ErrorDialog + reject() + + + 316 + 260 + + + 286 + 274 + + + + + From c834a5066d079bd8f554bab3fc463c0f32cdfb73 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 5 Dec 2021 02:26:23 +0100 Subject: [PATCH 13/99] [umount] Make it much more clear that the logfiles-thing is going away. --- CHANGES-3.2 | 6 ++++++ src/modules/umount/main.py | 1 + src/modules/umount/umount.conf | 18 +++++++++++------- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/CHANGES-3.2 b/CHANGES-3.2 index b658191fb..566a61ed9 100644 --- a/CHANGES-3.2 +++ b/CHANGES-3.2 @@ -13,6 +13,9 @@ This release contains contributions from (alphabetically by first name): - Artem Grinev - Evan James +Distributions are **specifically** reminded to update the *umount* module +configuration (and to use *preservefiles* if needed). + ## Core ## - Errors (e.g. when an installation fails for whatever reason) are displayed in a dialog with a scrollable details panel, rather than growing up @@ -21,6 +24,9 @@ This release contains contributions from (alphabetically by first name): ## Modules ## - *partition* now supports "deep" btrfs subvolume names, e.g. a separate subvolume for `/usr/local`. (Thanks Evan) + - The *umount* module now warns if the "preserve log file" feature is used. + This has been deprecated for a long time: use the *preservefiles* module + instead. A future release will turn this into an error. # 3.2.48 (2021-12-03) # diff --git a/src/modules/umount/main.py b/src/modules/umount/main.py index 77ea91e34..5fdb36014 100644 --- a/src/modules/umount/main.py +++ b/src/modules/umount/main.py @@ -80,6 +80,7 @@ def run(): if(libcalamares.job.configuration and "srcLog" in libcalamares.job.configuration and "destLog" in libcalamares.job.configuration): + libcalamares.utils.warning("Log-file preserving is **deprecated** in the *umount* module") log_source = libcalamares.job.configuration["srcLog"] log_destination = libcalamares.job.configuration["destLog"] # Relocate log_destination into target system diff --git a/src/modules/umount/umount.conf b/src/modules/umount/umount.conf index b6d86e353..062f7ac4b 100644 --- a/src/modules/umount/umount.conf +++ b/src/modules/umount/umount.conf @@ -10,16 +10,20 @@ # The "copy log files" functionality is deprecated; use the *preservefiles* # module instead, which is more flexible. # -# This module has two configuration keys: -# srcLog location in the live system where the log is -# destLog location in the target system to copy the log # --- -# example when using the normal Calamares log: -srcLog: "/root/.cache/calamares/session.log" -destLog: "/var/log/Calamares.log" - +# This is a **deprecated** example. Use the *preservefiles* module +# instead, where the equivalent configuration is this: +# +# files: +# - from: log +# dest: /var/log/installation.log +# +# Note that the "equivalent configuration" always finds the log, +# and is not dependent on specific user names or the vagaries of +# polkit configuration -- so it is a **better** "equivalent". +# # example when using a log created by `sudo calamares -d`: #srcLog: "/home/live/installation.log" #destLog: "/var/log/installation.log" From e8936392e373b6bc1ab93e5c3693152d388ff23c Mon Sep 17 00:00:00 2001 From: dalto Date: Sun, 5 Dec 2021 13:17:23 -0600 Subject: [PATCH 14/99] [luksopenswaphookcfg] Add support unlocking swap with root on a btrfs subvol --- src/modules/luksopenswaphookcfg/main.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/modules/luksopenswaphookcfg/main.py b/src/modules/luksopenswaphookcfg/main.py index ec09a631b..aaac8a31a 100644 --- a/src/modules/luksopenswaphookcfg/main.py +++ b/src/modules/luksopenswaphookcfg/main.py @@ -64,6 +64,11 @@ def write_openswap_conf(partitions, root_mount_point, openswap_conf_path): elif lines[i].startswith("keyfile_filename"): lines[i] = "keyfile_filename=crypto_keyfile.bin" + elif lines[i].startswith("#keyfile_device_mount_options"): + if libcalamares.globalstorage.contains("btrfsRootSubvolume"): + btrfs_root_subvolume = libcalamares.globalstorage.value("btrfsRootSubvolume") + lines[i] = "keyfile_device_mount_options=--options=subvol=" + btrfs_root_subvolume.lstrip("/") + with open(os.path.join(root_mount_point, openswap_conf_path), 'w') as openswap_file: openswap_file.write("\n".join(lines) + "\n") @@ -84,11 +89,11 @@ def run(): if not partitions: libcalamares.utils.warning("partitions is empty, {!s}".format(partitions)) return (_("Configuration Error"), - _("No partitions are defined for 
{!s}
to use." ).format("luksopenswaphookcfg")) + _("No partitions are defined for 
{!s}
to use.").format("luksopenswaphookcfg")) if not root_mount_point: libcalamares.utils.warning("rootMountPoint is empty, {!s}".format(root_mount_point)) return (_("Configuration Error"), - _("No root mount point is given for 
{!s}
to use." ).format("luksopenswaphookcfg")) + _("No root mount point is given for 
{!s}
to use.").format("luksopenswaphookcfg")) openswap_conf_path = openswap_conf_path.lstrip('/') From 32c5e18db0e75833e9ad599694edc0d040c9ae22 Mon Sep 17 00:00:00 2001 From: Artem Grinev Date: Mon, 6 Dec 2021 02:26:13 +0400 Subject: [PATCH 15/99] [libcalamaresui] Add QDialogButtonBox translation fix --- src/libcalamaresui/widgets/TranslationFix.cpp | 35 +++++++++++++------ src/libcalamaresui/widgets/TranslationFix.h | 3 ++ 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/src/libcalamaresui/widgets/TranslationFix.cpp b/src/libcalamaresui/widgets/TranslationFix.cpp index 1262fceb5..b73bd0e16 100644 --- a/src/libcalamaresui/widgets/TranslationFix.cpp +++ b/src/libcalamaresui/widgets/TranslationFix.cpp @@ -10,21 +10,16 @@ #include "TranslationFix.h" #include +#include #include #include +#include namespace Calamares { -void -fixButtonLabels( QMessageBox* box ) -{ - if ( !box ) - { - return; - } - - static std::pair< decltype( QMessageBox::Ok ), const char* > maps[] = { +//Using QMessageBox's StandardButton enum here but according to headers they should be kept in-sync between multiple classes. +static std::pair< decltype( QMessageBox::Ok ), const char* > maps[] = { { QMessageBox::Ok, QT_TRANSLATE_NOOP( "StandardButtons", "&OK" ) }, { QMessageBox::Yes, QT_TRANSLATE_NOOP( "StandardButtons", "&Yes" ) }, { QMessageBox::No, QT_TRANSLATE_NOOP( "StandardButtons", "&No" ) }, @@ -32,9 +27,17 @@ fixButtonLabels( QMessageBox* box ) { QMessageBox::Close, QT_TRANSLATE_NOOP( "StandardButtons", "&Close" ) }, }; +template +void fixButtonLabels ( TButtonBox* box ) +{ + if ( !box ) + { + return; + } + for ( auto [ sb, label ] : maps ) { - auto* button = box->button( sb ); + auto* button = box->button( static_cast(int(sb)) ); if ( button ) { button->setText( QCoreApplication::translate( "StandardButtons", label ) ); @@ -42,4 +45,16 @@ fixButtonLabels( QMessageBox* box ) } } +void +fixButtonLabels( QMessageBox* box ) +{ + fixButtonLabels(box); +} + +void +fixButtonLabels(QDialogButtonBox *box) +{ + fixButtonLabels(box); +} + } // namespace Calamares diff --git a/src/libcalamaresui/widgets/TranslationFix.h b/src/libcalamaresui/widgets/TranslationFix.h index 107dad67d..89ee9a51a 100644 --- a/src/libcalamaresui/widgets/TranslationFix.h +++ b/src/libcalamaresui/widgets/TranslationFix.h @@ -13,6 +13,7 @@ #include "DllMacro.h" class QMessageBox; +class QDialogButtonBox; namespace Calamares { @@ -26,6 +27,8 @@ namespace Calamares * guess the context. */ void UIDLLEXPORT fixButtonLabels( QMessageBox* ); + +void UIDLLEXPORT fixButtonLabels( QDialogButtonBox* ); } // namespace Calamares #endif From bfa7b9a7927b05ad2fcabc3ce460d640bc786d97 Mon Sep 17 00:00:00 2001 From: Artem Grinev Date: Mon, 6 Dec 2021 02:27:18 +0400 Subject: [PATCH 16/99] [libcalamaresui] Use translation fix for Error Dialog --- src/libcalamaresui/utils/ErrorDialog/ErrorDialog.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.cpp b/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.cpp index 080ff2115..29da42e4d 100644 --- a/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.cpp +++ b/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.cpp @@ -3,6 +3,7 @@ #include #include +#include "widgets/TranslationFix.h" namespace Calamares { @@ -81,7 +82,8 @@ void ErrorDialog::setShouldOfferWebPaste(bool newShouldOfferWebPaste) ui->buttonBox->setStandardButtons( m_shouldOfferWebPaste ? (QDialogButtonBox::Yes | QDialogButtonBox::No) : QDialogButtonBox::Close ); - + + fixButtonLabels(ui->buttonBox); emit shouldOfferWebPasteChanged(); } From 2dd77ee828f5df31460535abc85ef9c2489287d1 Mon Sep 17 00:00:00 2001 From: Artem Grinev Date: Mon, 6 Dec 2021 02:31:05 +0400 Subject: [PATCH 17/99] [libcalamaresui] Initialize Error Dialog field --- src/libcalamaresui/utils/ErrorDialog/ErrorDialog.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.h b/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.h index 8962c3e99..4196f6a7f 100644 --- a/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.h +++ b/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.h @@ -49,7 +49,7 @@ signals: private: Ui::ErrorDialog *ui; - bool m_shouldOfferWebPaste; + bool m_shouldOfferWebPaste = false; }; }; // namespace Calamares From 2f2a418cc42fa6b9bf3e2c68ab5f569e06e21e32 Mon Sep 17 00:00:00 2001 From: Artem Grinev Date: Mon, 6 Dec 2021 02:37:11 +0400 Subject: [PATCH 18/99] [libcalamaresui] Run clang-format --- src/libcalamaresui/ViewManager.cpp | 27 +++--- .../utils/ErrorDialog/ErrorDialog.cpp | 86 ++++++++++--------- .../utils/ErrorDialog/ErrorDialog.h | 56 ++++++------ 3 files changed, 91 insertions(+), 78 deletions(-) diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index ee521a02c..87024ea6b 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -17,6 +17,7 @@ #include "JobQueue.h" #include "Settings.h" +#include "utils/ErrorDialog/ErrorDialog.h" #include "utils/Logger.h" #include "utils/Paste.h" #include "utils/Retranslator.h" @@ -25,15 +26,14 @@ #include "viewpages/ExecutionViewStep.h" #include "viewpages/ViewStep.h" #include "widgets/TranslationFix.h" -#include "utils/ErrorDialog/ErrorDialog.h" #include #include #include +#include #include #include #include -#include #define UPDATE_BUTTON_PROPERTY( name, value ) \ do \ @@ -161,24 +161,27 @@ ViewManager::onInstallationFailed( const QString& message, const QString& detail cDebug() << Logger::SubEntry << "- details:" << Logger::NoQuote << details; QString heading - = Calamares::Settings::instance()->isSetupMode() ? tr( "Setup Failed" ) : tr( "Installation Failed" ); + = Calamares::Settings::instance()->isSetupMode() ? tr( "Setup Failed" ) : tr( "Installation Failed" ); ErrorDialog* errorDialog = new ErrorDialog(); errorDialog->setWindowTitle( tr( "Error" ) ); errorDialog->setHeading( "" + heading + "" ); errorDialog->setInformativeText( message ); - errorDialog->setShouldOfferWebPaste(shouldOfferWebPaste); - errorDialog->setDetails(details); + errorDialog->setShouldOfferWebPaste( shouldOfferWebPaste ); + errorDialog->setDetails( details ); errorDialog->show(); cDebug() << "Calamares will quit when the dialog closes."; - connect( errorDialog, &QDialog::finished, [errorDialog]( int result ) { - if ( result == QDialog::Accepted && errorDialog->shouldOfferWebPaste() ) - { - CalamaresUtils::Paste::doLogUploadUI( errorDialog ); - } - QApplication::quit(); - } ); + connect( errorDialog, + &QDialog::finished, + [ errorDialog ]( int result ) + { + if ( result == QDialog::Accepted && errorDialog->shouldOfferWebPaste() ) + { + CalamaresUtils::Paste::doLogUploadUI( errorDialog ); + } + QApplication::quit(); + } ); } diff --git a/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.cpp b/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.cpp index 29da42e4d..ca88031f6 100644 --- a/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.cpp +++ b/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.cpp @@ -1,19 +1,20 @@ #include "ErrorDialog.h" #include "ui_ErrorDialog.h" -#include -#include #include "widgets/TranslationFix.h" +#include +#include -namespace Calamares { - - -ErrorDialog::ErrorDialog(QWidget *parent) : - QDialog(parent), - ui(new Ui::ErrorDialog) +namespace Calamares { - ui->setupUi(this); - ui->iconLabel->setPixmap(QIcon::fromTheme("dialog-error").pixmap(64)); + + +ErrorDialog::ErrorDialog( QWidget* parent ) + : QDialog( parent ) + , ui( new Ui::ErrorDialog ) +{ + ui->setupUi( this ); + ui->iconLabel->setPixmap( QIcon::fromTheme( "dialog-error" ).pixmap( 64 ) ); ui->detailsWidget->hide(); ui->offerWebPasteLabel->hide(); } @@ -24,68 +25,75 @@ ErrorDialog::~ErrorDialog() } -QString ErrorDialog::heading() const +QString +ErrorDialog::heading() const { return ui->headingLabel->text(); } -QString ErrorDialog::informativeText() const +QString +ErrorDialog::informativeText() const { return ui->informativeTextLabel->text(); } -QString ErrorDialog::details() const +QString +ErrorDialog::details() const { return ui->detailsBrowser->toPlainText(); } -void ErrorDialog::setHeading(const QString &newHeading) +void +ErrorDialog::setHeading( const QString& newHeading ) { - if (ui->headingLabel->text() == newHeading) + if ( ui->headingLabel->text() == newHeading ) return; - ui->headingLabel->setText(newHeading); + ui->headingLabel->setText( newHeading ); emit headingChanged(); } -void ErrorDialog::setInformativeText(const QString &newInformativeText) +void +ErrorDialog::setInformativeText( const QString& newInformativeText ) { - if (ui->informativeTextLabel->text() == newInformativeText) + if ( ui->informativeTextLabel->text() == newInformativeText ) return; - ui->informativeTextLabel->setText(newInformativeText); + ui->informativeTextLabel->setText( newInformativeText ); emit informativeTextChanged(); } -void ErrorDialog::setDetails(const QString &newDetails) +void +ErrorDialog::setDetails( const QString& newDetails ) { - if (ui->detailsBrowser->toPlainText() == newDetails) - return; - ui->detailsBrowser->setPlainText(newDetails); - - ui->detailsWidget->setVisible(!ui->detailsBrowser->toPlainText().trimmed().isEmpty()); - + if ( ui->detailsBrowser->toPlainText() == newDetails ) + return; + ui->detailsBrowser->setPlainText( newDetails ); + + ui->detailsWidget->setVisible( !ui->detailsBrowser->toPlainText().trimmed().isEmpty() ); + emit detailsChanged(); } -bool ErrorDialog::shouldOfferWebPaste() const +bool +ErrorDialog::shouldOfferWebPaste() const { return m_shouldOfferWebPaste; } -void ErrorDialog::setShouldOfferWebPaste(bool newShouldOfferWebPaste) +void +ErrorDialog::setShouldOfferWebPaste( bool newShouldOfferWebPaste ) { - if (m_shouldOfferWebPaste == newShouldOfferWebPaste) + if ( m_shouldOfferWebPaste == newShouldOfferWebPaste ) return; m_shouldOfferWebPaste = newShouldOfferWebPaste; - - ui->offerWebPasteLabel->setVisible(m_shouldOfferWebPaste); - - ui->buttonBox->setStandardButtons( m_shouldOfferWebPaste - ? (QDialogButtonBox::Yes | QDialogButtonBox::No) - : QDialogButtonBox::Close ); - - fixButtonLabels(ui->buttonBox); - + + ui->offerWebPasteLabel->setVisible( m_shouldOfferWebPaste ); + + ui->buttonBox->setStandardButtons( m_shouldOfferWebPaste ? ( QDialogButtonBox::Yes | QDialogButtonBox::No ) + : QDialogButtonBox::Close ); + + fixButtonLabels( ui->buttonBox ); + emit shouldOfferWebPasteChanged(); } -} // namespace Calamares +} // namespace Calamares diff --git a/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.h b/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.h index 4196f6a7f..0c700f8d3 100644 --- a/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.h +++ b/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.h @@ -4,7 +4,8 @@ #include -namespace Ui { +namespace Ui +{ class ErrorDialog; } class QDialogButtonBox; @@ -13,45 +14,46 @@ namespace Calamares class ErrorDialog : public QDialog { Q_OBJECT - - Q_PROPERTY(QString heading READ heading WRITE setHeading NOTIFY headingChanged) - Q_PROPERTY(QString informativeText READ informativeText WRITE setInformativeText NOTIFY informativeTextChanged) - Q_PROPERTY(QString details READ details WRITE setDetails NOTIFY detailsChanged) - Q_PROPERTY(bool shouldOfferWebPaste READ shouldOfferWebPaste WRITE setShouldOfferWebPaste NOTIFY shouldOfferWebPasteChanged) - + + Q_PROPERTY( QString heading READ heading WRITE setHeading NOTIFY headingChanged ) + Q_PROPERTY( QString informativeText READ informativeText WRITE setInformativeText NOTIFY informativeTextChanged ) + Q_PROPERTY( QString details READ details WRITE setDetails NOTIFY detailsChanged ) + Q_PROPERTY( bool shouldOfferWebPaste READ shouldOfferWebPaste WRITE setShouldOfferWebPaste NOTIFY + shouldOfferWebPasteChanged ) + public: - explicit ErrorDialog(QWidget *parent = nullptr); + explicit ErrorDialog( QWidget* parent = nullptr ); ~ErrorDialog(); - + QString heading() const; - + QString informativeText() const; - + QString details() const; - - void setHeading(const QString &newHeading); - - void setInformativeText(const QString &newInformativeText); - - void setDetails(const QString &newDetails); - + + void setHeading( const QString& newHeading ); + + void setInformativeText( const QString& newInformativeText ); + + void setDetails( const QString& newDetails ); + bool shouldOfferWebPaste() const; - void setShouldOfferWebPaste(bool newShouldOfferWebPaste); - + void setShouldOfferWebPaste( bool newShouldOfferWebPaste ); + signals: void headingChanged(); - + void informativeTextChanged(); - + void detailsChanged(); - + void shouldOfferWebPasteChanged(); - + private: - Ui::ErrorDialog *ui; + Ui::ErrorDialog* ui; bool m_shouldOfferWebPaste = false; }; -}; // namespace Calamares +}; // namespace Calamares -#endif // ERRORDIALOG_H +#endif // ERRORDIALOG_H From d9f7726f7db3db97955fed876d37a80af7006a96 Mon Sep 17 00:00:00 2001 From: Artem Grinev Date: Mon, 6 Dec 2021 02:41:17 +0400 Subject: [PATCH 19/99] [libcalamaresui] Add SPDX-header for Error Dialog files --- src/libcalamaresui/utils/ErrorDialog/ErrorDialog.cpp | 9 +++++++++ src/libcalamaresui/utils/ErrorDialog/ErrorDialog.h | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.cpp b/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.cpp index ca88031f6..4ffe20384 100644 --- a/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.cpp +++ b/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.cpp @@ -1,3 +1,12 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2021 Artem Grinev + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + #include "ErrorDialog.h" #include "ui_ErrorDialog.h" diff --git a/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.h b/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.h index 0c700f8d3..a0126c2ce 100644 --- a/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.h +++ b/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.h @@ -1,3 +1,12 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2021 Artem Grinev + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + #ifndef ERRORDIALOG_H #define ERRORDIALOG_H From aa332477fd1858603f528a5f036925624446249a Mon Sep 17 00:00:00 2001 From: Artem Grinev Date: Mon, 6 Dec 2021 03:11:16 +0400 Subject: [PATCH 20/99] [libcalamaresui] Run clang-format on TranslationFix.cpp --- src/libcalamaresui/widgets/TranslationFix.cpp | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/libcalamaresui/widgets/TranslationFix.cpp b/src/libcalamaresui/widgets/TranslationFix.cpp index b73bd0e16..dbfd0bd83 100644 --- a/src/libcalamaresui/widgets/TranslationFix.cpp +++ b/src/libcalamaresui/widgets/TranslationFix.cpp @@ -10,34 +10,35 @@ #include "TranslationFix.h" #include -#include #include -#include #include +#include +#include namespace Calamares { //Using QMessageBox's StandardButton enum here but according to headers they should be kept in-sync between multiple classes. static std::pair< decltype( QMessageBox::Ok ), const char* > maps[] = { - { QMessageBox::Ok, QT_TRANSLATE_NOOP( "StandardButtons", "&OK" ) }, - { QMessageBox::Yes, QT_TRANSLATE_NOOP( "StandardButtons", "&Yes" ) }, - { QMessageBox::No, QT_TRANSLATE_NOOP( "StandardButtons", "&No" ) }, - { QMessageBox::Cancel, QT_TRANSLATE_NOOP( "StandardButtons", "&Cancel" ) }, - { QMessageBox::Close, QT_TRANSLATE_NOOP( "StandardButtons", "&Close" ) }, - }; + { QMessageBox::Ok, QT_TRANSLATE_NOOP( "StandardButtons", "&OK" ) }, + { QMessageBox::Yes, QT_TRANSLATE_NOOP( "StandardButtons", "&Yes" ) }, + { QMessageBox::No, QT_TRANSLATE_NOOP( "StandardButtons", "&No" ) }, + { QMessageBox::Cancel, QT_TRANSLATE_NOOP( "StandardButtons", "&Cancel" ) }, + { QMessageBox::Close, QT_TRANSLATE_NOOP( "StandardButtons", "&Close" ) }, +}; -template -void fixButtonLabels ( TButtonBox* box ) +template < typename TButtonBox > +void +fixButtonLabels( TButtonBox* box ) { if ( !box ) { return; } - + for ( auto [ sb, label ] : maps ) { - auto* button = box->button( static_cast(int(sb)) ); + auto* button = box->button( static_cast< typename TButtonBox::StandardButton >( int( sb ) ) ); if ( button ) { button->setText( QCoreApplication::translate( "StandardButtons", label ) ); @@ -48,13 +49,13 @@ void fixButtonLabels ( TButtonBox* box ) void fixButtonLabels( QMessageBox* box ) { - fixButtonLabels(box); + fixButtonLabels< QMessageBox >( box ); } void -fixButtonLabels(QDialogButtonBox *box) +fixButtonLabels( QDialogButtonBox* box ) { - fixButtonLabels(box); + fixButtonLabels< QDialogButtonBox >( box ); } } // namespace Calamares From b8c02587ae6accef5f85c06c49bc3e00d3cfccdf Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 6 Dec 2021 10:29:16 +0100 Subject: [PATCH 21/99] Changes: post-release housekeeping --- CHANGES-3.2 | 13 +++++++++++++ CMakeLists.txt | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/CHANGES-3.2 b/CHANGES-3.2 index baaf261d4..81fd55343 100644 --- a/CHANGES-3.2 +++ b/CHANGES-3.2 @@ -7,6 +7,19 @@ contributors are listed. Note that Calamares does not have a historical changelog -- this log starts with version 3.2.0. The release notes on the website will have to do for older versions. +# 3.2.49 (unreleased) # + +This release contains contributions from (alphabetically by first name): + - Evan James + +## Core ## + - No core changes yet + +## Modules ## + - *partition* now supports "deep" btrfs subvolume names, e.g. a + separate subvolume for `/usr/local`. (Thanks Evan) + + # 3.2.48 (2021-12-03) # This release contains contributions from (alphabetically by first name): diff --git a/CMakeLists.txt b/CMakeLists.txt index c998d43d0..1a55eae1c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,11 +41,11 @@ # TODO:3.3: Require CMake 3.12 cmake_minimum_required( VERSION 3.3 FATAL_ERROR ) project( CALAMARES - VERSION 3.2.48 + VERSION 3.2.49 LANGUAGES C CXX ) -set( CALAMARES_VERSION_RC 0 ) # Set to 0 during release cycle, 1 during development +set( CALAMARES_VERSION_RC 1 ) # Set to 0 during release cycle, 1 during development if( CALAMARES_VERSION_RC EQUAL 1 AND CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR ) message( FATAL_ERROR "Do not build development versions in the source-directory." ) endif() From 6e08da6c8d4bcf7608e6b61dc170d06e0b3246f7 Mon Sep 17 00:00:00 2001 From: dalto Date: Sat, 4 Dec 2021 09:10:49 -0600 Subject: [PATCH 22/99] [bootloader] Fix error with systemd-boot when path exists in the ESP --- src/modules/bootloader/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py index 25c7e0d9b..0182d1110 100644 --- a/src/modules/bootloader/main.py +++ b/src/modules/bootloader/main.py @@ -224,7 +224,7 @@ def create_systemd_boot_conf(install_path, efi_dir, uuid, entry, entry_name, ker # Copy kernel and initramfs to a subdirectory of /efi partition files_dir = os.path.join(install_path + efi_dir, entry_name) - os.mkdir(files_dir) + os.makedirs(files_dir, exist_ok=True) kernel_path = install_path + kernel kernel_name = os.path.basename(kernel_path) From baf8297cc4eeb6f5aba774a61dea10673bab2d15 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 3 Dec 2021 12:11:33 +0100 Subject: [PATCH 23/99] [libcalamares] Reading a file from target system --- .../utils/CalamaresUtilsSystem.cpp | 24 +++++++++++++++++++ src/libcalamares/utils/CalamaresUtilsSystem.h | 18 ++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/src/libcalamares/utils/CalamaresUtilsSystem.cpp b/src/libcalamares/utils/CalamaresUtilsSystem.cpp index b290b62c5..301d20b33 100644 --- a/src/libcalamares/utils/CalamaresUtilsSystem.cpp +++ b/src/libcalamares/utils/CalamaresUtilsSystem.cpp @@ -147,6 +147,30 @@ System::createTargetFile( const QString& path, const QByteArray& contents, Write return CreationResult( QFileInfo( f ).canonicalFilePath() ); } +QStringList +System::readTargetFile( const QString& path ) const +{ + const QString completePath = targetPath( path ); + if ( completePath.isEmpty() ) + { + return QStringList(); + } + + QFile f( completePath ); + if ( !f.open( QIODevice::ReadOnly ) ) + { + return QStringList(); + } + + QTextStream in( &f ); + QStringList l; + while ( !f.atEnd() ) + { + l << in.readLine(); + } + return l; +} + void System::removeTargetFile( const QString& path ) const { diff --git a/src/libcalamares/utils/CalamaresUtilsSystem.h b/src/libcalamares/utils/CalamaresUtilsSystem.h index e11ecae05..1bb5629d1 100644 --- a/src/libcalamares/utils/CalamaresUtilsSystem.h +++ b/src/libcalamares/utils/CalamaresUtilsSystem.h @@ -287,6 +287,24 @@ public: */ DLLEXPORT void removeTargetFile( const QString& path ) const; + /** @brief Reads a file from the target system. + * + * @param path Path to the file; this is interpreted from the root of + * the target system (@see targetPath()). + * + * Does no error checking, and returns an empty list if the file does + * not exist. + * + * NOTE: This function is now basically the same as QFile::readAll(), + * splitting into lines, but Calamares may need to change + * permissions or raise privileges to actually read the file, + * which is why there is an API. + * + * NOTE: Since this buffers the whole file in memory, reading big files + * is not recommended. + */ + DLLEXPORT QStringList readTargetFile( const QString& path ) const; + /** @brief Ensure that the directory @p path exists * * @param path a full pathname to a desired directory. From 6ef7acc1080d577359f2f5e26436a93221fee546 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 3 Dec 2021 13:22:18 +0100 Subject: [PATCH 24/99] [libcalamares] Add minor tests for new readTargetFile --- src/libcalamares/utils/Tests.cpp | 81 ++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/src/libcalamares/utils/Tests.cpp b/src/libcalamares/utils/Tests.cpp index 12b72cb4c..8fd11cd87 100644 --- a/src/libcalamares/utils/Tests.cpp +++ b/src/libcalamares/utils/Tests.cpp @@ -76,6 +76,9 @@ private Q_SLOTS: void testCalculateWorkingDirectory(); void testRunnerOutput(); + /** @section Test file-functions */ + void testReadWriteFile(); + private: void recursiveCompareMap( const QVariantMap& a, const QVariantMap& b, int depth ); }; @@ -950,6 +953,84 @@ LibCalamaresTests::testRunnerOutput() } +CalamaresUtils::System* +file_setup( const QTemporaryDir& tempRoot ) +{ + CalamaresUtils::System* ss = CalamaresUtils::System::instance(); + if ( !ss ) + { + ss = new CalamaresUtils::System( true ); + } + + Calamares::GlobalStorage* gs + = Calamares::JobQueue::instance() ? Calamares::JobQueue::instance()->globalStorage() : nullptr; + if ( !gs ) + { + cDebug() << "Creating new JobQueue"; + (void)new Calamares::JobQueue(); + gs = Calamares::JobQueue::instance() ? Calamares::JobQueue::instance()->globalStorage() : nullptr; + } + if ( gs ) + { + // Working with a rootMountPoint set + gs->insert( "rootMountPoint", tempRoot.path() ); + } + return ss; +} + +void +LibCalamaresTests::testReadWriteFile() +{ + static const QByteArray otherContents( "derp\n" ); + + QTemporaryDir tempRoot( QDir::tempPath() + QStringLiteral( "/test-job-XXXXXX" ) ); + auto* ss = file_setup( tempRoot ); + + QVERIFY( ss ); + { + auto fullPath = ss->createTargetFile( "test0", QByteArray(), CalamaresUtils::System::WriteMode::Overwrite ); + QVERIFY( fullPath ); + QVERIFY( !fullPath.path().isEmpty() ); + + QFileInfo fi( fullPath.path() ); + QVERIFY( fi.exists() ); + QVERIFY( fi.isFile() ); + QCOMPARE( fi.size(), 0 ); + } + // It won't overwrite unless you ask for it + { + auto fullPath = ss->createTargetFile( "test0", otherContents ); + QVERIFY( !fullPath ); // Failed, because it won't overwrite + QCOMPARE( fullPath.code(), decltype(fullPath)::Code::AlreadyExists ); + QVERIFY( fullPath.path().isEmpty() ); // Because it wasn't written + + QFileInfo fi( tempRoot.filePath( "test0" ) ); // Compute the name some other way + QVERIFY( fi.exists() ); + QVERIFY( fi.isFile() ); + QCOMPARE( fi.size(), 0 ); + } + // But it will if you say so explicitly + { + auto fullPath = ss->createTargetFile( "test0", otherContents, CalamaresUtils::System::WriteMode::Overwrite ); + QVERIFY( fullPath ); + QVERIFY( !fullPath.path().isEmpty() ); + + QFileInfo fi( fullPath.path() ); + QVERIFY( fi.exists() ); + QVERIFY( fi.isFile() ); + QCOMPARE( fi.size(), 5 ); + } + + // Now it's been written, we can read it, too + { + auto contents = ss->readTargetFile( "test0" ); + QVERIFY( !contents.isEmpty() ); + QCOMPARE( contents.count(), 1 ); + QCOMPARE( contents[ 0 ], QStringLiteral( "derp" ) ); // No trailing \n + } +} + + QTEST_GUILESS_MAIN( LibCalamaresTests ) #include "utils/moc-warnings.h" From 890c17cd71b2126e0a20f42fa9025b0f6358f62b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 6 Dec 2021 12:29:03 +0100 Subject: [PATCH 25/99] [libcalamares] Expand error-logging when creating files --- src/libcalamares/utils/CalamaresUtilsSystem.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/libcalamares/utils/CalamaresUtilsSystem.cpp b/src/libcalamares/utils/CalamaresUtilsSystem.cpp index 301d20b33..9a4ba990f 100644 --- a/src/libcalamares/utils/CalamaresUtilsSystem.cpp +++ b/src/libcalamares/utils/CalamaresUtilsSystem.cpp @@ -115,12 +115,14 @@ System::createTargetFile( const QString& path, const QByteArray& contents, Write QString completePath = targetPath( path ); if ( completePath.isEmpty() ) { + cWarning() << "No target path for" << path; return CreationResult( CreationResult::Code::Invalid ); } QFile f( completePath ); if ( ( mode == WriteMode::KeepExisting ) && f.exists() ) { + cWarning() << "Target file" << completePath << "already exists"; return CreationResult( CreationResult::Code::AlreadyExists ); } @@ -133,13 +135,16 @@ System::createTargetFile( const QString& path, const QByteArray& contents, Write if ( !f.open( m ) ) { + cWarning() << "Could not open target file" << completePath; return CreationResult( CreationResult::Code::Failed ); } - if ( f.write( contents ) != contents.size() ) + auto written = f.write( contents ); + if ( written != contents.size() ) { f.close(); f.remove(); + cWarning() << "Short write (" << written << "out of" << contents.size() << "bytes) to" << completePath; return CreationResult( CreationResult::Code::Failed ); } From d89553a7773b0a5b2f362fd903de191f246ddff2 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 6 Dec 2021 14:44:38 +0100 Subject: [PATCH 26/99] [partition] Avoid problems with MessageAndPath in containers (drop const) --- src/modules/partition/jobs/ClearMountsJob.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/modules/partition/jobs/ClearMountsJob.cpp b/src/modules/partition/jobs/ClearMountsJob.cpp index 831a1e868..2f5a8bd36 100644 --- a/src/modules/partition/jobs/ClearMountsJob.cpp +++ b/src/modules/partition/jobs/ClearMountsJob.cpp @@ -243,14 +243,8 @@ public: } private: -#if ( QT_VERSION < QT_VERSION_CHECK( 5, 15, 0 ) ) - // TODO: 3.3 remove because newer Qt does support constness const char* m_message = nullptr; QString m_path; -#else - const char* const m_message = nullptr; - QString const m_path; -#endif }; STATICTEST inline QDebug& From 149f3ff3fe18a239e6c71bc93c0f570f0358bc07 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 6 Dec 2021 14:52:33 +0100 Subject: [PATCH 27/99] [partition] Reduce warnings about shadowed variables --- .../partition/jobs/CreatePartitionJob.cpp | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/modules/partition/jobs/CreatePartitionJob.cpp b/src/modules/partition/jobs/CreatePartitionJob.cpp index 83ebc0509..3e51ed598 100644 --- a/src/modules/partition/jobs/CreatePartitionJob.cpp +++ b/src/modules/partition/jobs/CreatePartitionJob.cpp @@ -60,24 +60,24 @@ createZfs( Partition* partition, Device* device ) // Now we need to do some things that would normally be done by kpmcore // First we get the device node from the output and set it as the partition path - QRegularExpression re( QStringLiteral( "Created a new partition (\\d+)" ) ); - QRegularExpressionMatch rem = re.match( r.getOutput() ); - QString deviceNode; - if ( rem.hasMatch() ) { - if ( partition->devicePath().back().isDigit() ) + QRegularExpression re( QStringLiteral( "Created a new partition (\\d+)" ) ); + QRegularExpressionMatch rem = re.match( r.getOutput() ); + + if ( rem.hasMatch() ) { - deviceNode = partition->devicePath() + QLatin1Char( 'p' ) + rem.captured( 1 ); - } - else - { - deviceNode = partition->devicePath() + rem.captured( 1 ); + if ( partition->devicePath().back().isDigit() ) + { + deviceNode = partition->devicePath() + QLatin1Char( 'p' ) + rem.captured( 1 ); + } + else + { + deviceNode = partition->devicePath() + rem.captured( 1 ); + } } + partition->setPartitionPath( deviceNode ); } - - partition->setPartitionPath( deviceNode ); - // If it is a gpt device, set the partition UUID if ( device->partitionTable()->type() == PartitionTable::gpt && partition->uuid().isEmpty() ) { From eb2cf60466fb9dbab07742b2bda249a4e359b614 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 7 Dec 2021 10:57:06 +0100 Subject: [PATCH 28/99] CI: support FreeBSD when pulling translations --- ci/txpull.sh | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/ci/txpull.sh b/ci/txpull.sh index f68814560..1c5c11a45 100755 --- a/ci/txpull.sh +++ b/ci/txpull.sh @@ -116,6 +116,19 @@ git commit "$AUTHOR" --message="i18n: [desktop] $BOILERPLATE" | true # PO-Created line). This applies only to modules which use po-files. git diff --numstat src/modules | awk '($1==1 && $2==1){print $3}' | xargs git checkout -- +# sed either wants -i'' (GNU sed) or -i '' (BSD sed) to +# replace in a file, with no backup extension. Define +# a `reinplace` command to deal with the difference. +if test FreeBSD = `uname` ; then + reinplace() { + sed -i '' "$@" + } +else + reinplace() { + sed -i'' "$@" + } +fi + # Go through the Python modules; those with a lang/ subdir have their # own complete gettext-based setup. for MODULE_DIR in $(find src/modules -maxdepth 1 -mindepth 1 -type d) ; do @@ -125,7 +138,7 @@ for MODULE_DIR in $(find src/modules -maxdepth 1 -mindepth 1 -type d) ; do if [ -d ${MODULE_DIR}/lang ]; then # Convert PO files to MO files for POFILE in $(find ${MODULE_DIR} -name "*.po") ; do - sed -i'' '/^"Content-Type/s/CHARSET/UTF-8/' $POFILE + reinplace '/^"Content-Type/s/CHARSET/UTF-8/' $POFILE # msgfmt -o ${POFILE%.po}.mo $POFILE done git add --verbose ${MODULE_DIR}/lang/* @@ -135,7 +148,7 @@ for MODULE_DIR in $(find src/modules -maxdepth 1 -mindepth 1 -type d) ; do done for POFILE in $(find lang -name "python.po") ; do - sed -i'' '/^"Content-Type/s/CHARSET/UTF-8/' $POFILE + reinplace '/^"Content-Type/s/CHARSET/UTF-8/' $POFILE # msgfmt -o ${POFILE%.po}.mo $POFILE done git add --verbose lang/python* From 13196ed2e2f2913375f6e64ad65750dfd6ca2316 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 7 Dec 2021 11:04:19 +0100 Subject: [PATCH 29/99] CI: sort .desktop entries for i18n The ordering of entries jumps around sometimes when reading from Transifex (this might be Python unordered dictionaries, or based on translation statistics -- I can't tell). Force an order by sorting on language code and key-name so they all end up grouped by language code, sorted Name Icon GenericName Comment. Although this shuffles some more entries now, longer-term it will reduce churn in the .desktop file. --- ci/txpull.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ci/txpull.sh b/ci/txpull.sh index 1c5c11a45..a6e4127af 100755 --- a/ci/txpull.sh +++ b/ci/txpull.sh @@ -108,6 +108,21 @@ awk ' skip=0; print $0; }}' < calamares.desktop > calamares.desktop.new mv calamares.desktop.new calamares.desktop +# Now group translated key-names (Name, Icon, Description, ..) by sorted +# language key rather than random-ish language-key order (which shuffles +# entries around). +# +# First, the non-translated lines +grep -v '\[.*\]=' calamares.desktop > calamares.desktop.new +# The translated lines: +# - replace (the first) [] by | so we have a consistent field separator +# - sort based on field 2, then 1 (language code, then reversed key-name) +# - replace the first | by [, the first (remaining) | by ] +# Effectively this puts the fields in this order: Name, Icon, Generic Name, +# Comment -- within each language key. This keeps churn down since the +# language codes and key-names are constant. +grep '\[.*\]=' calamares.desktop | sed -e 's/\[/|/' -e 's/\]/|/' | sort -t '|' -k 2,2 -k 1,1r | sed -e 's/|/\[/' | sed -e 's/|/\]/' >> calamares.desktop.new +mv calamares.desktop.new calamares.desktop git add --verbose calamares.desktop git commit "$AUTHOR" --message="i18n: [desktop] $BOILERPLATE" | true From 8e4c9b8bd60d60d9ec8bf949d666bcdf5d20d6c4 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Tue, 7 Dec 2021 10:58:18 +0100 Subject: [PATCH 30/99] i18n: [calamares] Automatic merge of Transifex translations --- lang/calamares_sv.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lang/calamares_sv.ts b/lang/calamares_sv.ts index 5fdcce0eb..64946e710 100644 --- a/lang/calamares_sv.ts +++ b/lang/calamares_sv.ts @@ -688,17 +688,17 @@ Alla ändringar kommer att gå förlorade. Successfully unmounted %1. - + Framgångsrikt avmonterade %1. Successfully disabled swap %1. - + Framgångsrikt inaktiverade swap %1. Successfully cleared swap %1. - + Framgångsrikt rensade swap %1. @@ -708,7 +708,7 @@ Alla ändringar kommer att gå förlorade. Successfully disabled volume group %1. - + Framgångsrikt inaktiverade volymgrupp %1. From c8ea3bccf72bea180b62e724a962d39ebc233eca Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Tue, 7 Dec 2021 10:58:18 +0100 Subject: [PATCH 31/99] i18n: [desktop] Automatic merge of Transifex translations --- calamares.desktop | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/calamares.desktop b/calamares.desktop index bfe3955b1..48d0df26d 100644 --- a/calamares.desktop +++ b/calamares.desktop @@ -98,10 +98,6 @@ Name[hr]=Instaliraj sustav Icon[hr]=calamares GenericName[hr]=Instalacija sustava Comment[hr]=Calamares — Instalacija sustava -Name[ie]=Installar li sistema -Icon[ie]=calamares -GenericName[ie]=Installator del sistema -Comment[ie]=Calamares — Installator del sistema Name[hu]=Rendszer telepítése Icon[hu]=calamares GenericName[hu]=Rendszertelepítő @@ -114,10 +110,6 @@ Name[is]=Setja upp kerfið Icon[is]=calamares GenericName[is]=Kerfis uppsetning Comment[is]=Calamares — Kerfis uppsetning -Name[cs_CZ]=Nainstalovat systém -Icon[cs_CZ]=calamares -GenericName[cs_CZ]=Instalátor systému -Comment[cs_CZ]=Calamares – instalátor operačních systémů Name[ja]=システムをインストール Icon[ja]=calamares GenericName[ja]=システムインストーラー @@ -158,6 +150,14 @@ Name[pl]=Zainstaluj system Icon[pl]=calamares GenericName[pl]=Instalator systemu Comment[pl]=Calamares — Instalator systemu +Name[ie]=Installar li sistema +Icon[ie]=calamares +GenericName[ie]=Installator del sistema +Comment[ie]=Calamares — Installator del sistema +Name[cs_CZ]=Nainstalovat systém +Icon[cs_CZ]=calamares +GenericName[cs_CZ]=Instalátor systému +Comment[cs_CZ]=Calamares – instalátor operačních systémů Name[pt_BR]=Sistema de Instalação Icon[pt_BR]=calamares GenericName[pt_BR]=Instalador de Sistema @@ -174,11 +174,6 @@ Name[si]=පද්ධතිය ස්ථාපනය කරන්න Icon[si]=කැලමරේස් GenericName[si]=පද්ධති ස්ථාපකය Comment[si]=Calamares - පද්ධති ස්ථාපකය -Name[sk]=Inštalovať systém -Icon[sk]=calamares -GenericName[sk]=Inštalátor systému -Comment[sk]=Calamares — Inštalátor systému -Name[sl]=Namesti sistem Name[sq]=Instalo Sistemin Icon[sq]=calamares GenericName[sq]=Instalues Sistemi @@ -187,11 +182,16 @@ Name[fi_FI]=Asenna järjestelmä Icon[fi_FI]=calamares GenericName[fi_FI]=Järjestelmän asennusohjelma Comment[fi_FI]=Calamares — Järjestelmän asentaja -Name[sr@latin]=Instaliraj sistem Name[sr]=Инсталирај систем Icon[sr]=calamares GenericName[sr]=Инсталатер система Comment[sr]=Каламарес — инсталатер система +Name[sr@latin]=Instaliraj sistem +Name[sk]=Inštalovať systém +Icon[sk]=calamares +GenericName[sk]=Inštalátor systému +Comment[sk]=Calamares — Inštalátor systému +Name[sl]=Namesti sistem Name[sv]=Installera system Icon[sv]=calamares GenericName[sv]=Systeminstallerare From d2ac201b982d272da2ce9220277e74e9155a1f5b Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Tue, 7 Dec 2021 11:05:37 +0100 Subject: [PATCH 32/99] i18n: [desktop] Automatic merge of Transifex translations --- calamares.desktop | 108 +++++++++++++++++++++++----------------------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/calamares.desktop b/calamares.desktop index 48d0df26d..4db300495 100644 --- a/calamares.desktop +++ b/calamares.desktop @@ -21,10 +21,18 @@ Name[as]=চিছটেম ইনস্তল কৰক Icon[as]=কেলামাৰেচ GenericName[as]=চিছটেম ইনস্তলাৰ Comment[as]=কেলামাৰেচ — চিছটেম​ ইনস্তলাৰ +Name[ast]=Instalar el sistema +Icon[ast]=calamares +GenericName[ast]=Instalador del sistema +Comment[ast]=Calamares — Instalador del sistema Name[az]=Sistemi Quraşdırmaq Icon[az]=calamares GenericName[az]=Sistem Quraşdırıcısı Comment[az]=Calamares Sistem Quraşdırıcısı +Name[az_AZ]=Sistemi quraşdırmaq +Icon[az_AZ]=calamares +GenericName[az_AZ]=Sistem quraşdırcısı +Comment[az_AZ]=Calamares — Sistem Quraşdırıcısı Name[be]=Усталяваць сістэму Icon[be]=calamares GenericName[be]=Усталёўшчык сістэмы @@ -41,6 +49,10 @@ Name[ca]=Instal·la el sistema Icon[ca]=calamares GenericName[ca]=Instal·lador de sistema Comment[ca]=Calamares — Instal·lador de sistema +Name[cs_CZ]=Nainstalovat systém +Icon[cs_CZ]=calamares +GenericName[cs_CZ]=Instalátor systému +Comment[cs_CZ]=Calamares – instalátor operačních systémů Name[da]=Installér system Icon[da]=calamares GenericName[da]=Systeminstallationsprogram @@ -57,10 +69,19 @@ Name[en_GB]=Install System Icon[en_GB]=calamares GenericName[en_GB]=System Installer Comment[en_GB]=Calamares — System Installer +Name[eo]=Instali Sistemo +Icon[eo]=calamares +GenericName[eo]=Sistema Instalilo +Comment[eo]=Calamares — Sistema Instalilo Name[es]=Instalar Sistema Icon[es]=calamares GenericName[es]=Instalador del Sistema Comment[es]=Calamares — Instalador del Sistema +Name[es_MX]=Instalar el Sistema +Icon[es_MX]=calamares +GenericName[es_MX]=Instalador del sistema +Comment[es_MX]=Calamares - Instalador del sistema +Name[es_PR]=Instalar el sistema Name[et]=Paigalda süsteem Icon[et]=calamares GenericName[et]=Süsteemipaigaldaja @@ -73,7 +94,10 @@ Name[fa]=نصب سامانه Icon[fa]=کالامارس GenericName[fa]=نصب‌کننده سامانه Comment[fa]=کالامارس — نصب‌کننده سامانه -Name[es_PR]=Instalar el sistema +Name[fi_FI]=Asenna järjestelmä +Icon[fi_FI]=calamares +GenericName[fi_FI]=Järjestelmän asennusohjelma +Comment[fi_FI]=Calamares — Järjestelmän asentaja Name[fr]=Installer le système Icon[fr]=calamares GenericName[fr]=Installateur système @@ -106,10 +130,18 @@ Name[id]=Instal Sistem Icon[id]=calamares GenericName[id]=Pemasang Comment[id]=Calamares — Pemasang Sistem +Name[ie]=Installar li sistema +Icon[ie]=calamares +GenericName[ie]=Installator del sistema +Comment[ie]=Calamares — Installator del sistema Name[is]=Setja upp kerfið Icon[is]=calamares GenericName[is]=Kerfis uppsetning Comment[is]=Calamares — Kerfis uppsetning +Name[it_IT]=Installa il sistema +Icon[it_IT]=calamares +GenericName[it_IT]=Programma d'installazione del sistema +Comment[it_IT]=Calamares — Programma d'installazione del sistema Name[ja]=システムをインストール Icon[ja]=calamares GenericName[ja]=システムインストーラー @@ -122,10 +154,6 @@ Name[lt]=Įdiegti Sistemą Icon[lt]=calamares GenericName[lt]=Sistemos diegimas į kompiuterį Comment[lt]=Calamares — Sistemos diegimo programa -Name[it_IT]=Installa il sistema -Icon[it_IT]=calamares -GenericName[it_IT]=Programma d'installazione del sistema -Comment[it_IT]=Calamares — Programma d'installazione del sistema Name[mk]=Инсталирај го системот Icon[mk]=calamares GenericName[mk]=Системен Инсталер @@ -138,30 +166,26 @@ Name[nb]=Installer System Icon[nb]=calamares GenericName[nb]=Systeminstallatør Comment[nb]=Calamares-systeminstallatør +Name[ne_NP]= सिस्टम इन्स्टल गर्नुहोस् +Icon[ne_NP]=Calamares +GenericName[ne_NP]=सिस्टम इन्स्टलर +Comment[ne_NP]=Calamares - सिस्टम इन्स्टलर Name[nl]=Installeer systeem Icon[nl]=calamares GenericName[nl]=Installatieprogramma Comment[nl]=Calamares — Installatieprogramma -Name[az_AZ]=Sistemi quraşdırmaq -Icon[az_AZ]=calamares -GenericName[az_AZ]=Sistem quraşdırcısı -Comment[az_AZ]=Calamares — Sistem Quraşdırıcısı Name[pl]=Zainstaluj system Icon[pl]=calamares GenericName[pl]=Instalator systemu Comment[pl]=Calamares — Instalator systemu -Name[ie]=Installar li sistema -Icon[ie]=calamares -GenericName[ie]=Installator del sistema -Comment[ie]=Calamares — Installator del sistema -Name[cs_CZ]=Nainstalovat systém -Icon[cs_CZ]=calamares -GenericName[cs_CZ]=Instalátor systému -Comment[cs_CZ]=Calamares – instalátor operačních systémů Name[pt_BR]=Sistema de Instalação Icon[pt_BR]=calamares GenericName[pt_BR]=Instalador de Sistema Comment[pt_BR]=Calamares — Instalador de Sistema +Name[pt_PT]=Instalar Sistema +Icon[pt_PT]=calamares +GenericName[pt_PT]=Instalador de Sistema +Comment[pt_PT]=Instalador de Sistema - Calamares Name[ro]=Instalează sistemul Icon[ro]=calamares GenericName[ro]=Instalator de sistem @@ -174,24 +198,20 @@ Name[si]=පද්ධතිය ස්ථාපනය කරන්න Icon[si]=කැලමරේස් GenericName[si]=පද්ධති ස්ථාපකය Comment[si]=Calamares - පද්ධති ස්ථාපකය -Name[sq]=Instalo Sistemin -Icon[sq]=calamares -GenericName[sq]=Instalues Sistemi -Comment[sq]=Calamares — Instalues Sistemi -Name[fi_FI]=Asenna järjestelmä -Icon[fi_FI]=calamares -GenericName[fi_FI]=Järjestelmän asennusohjelma -Comment[fi_FI]=Calamares — Järjestelmän asentaja -Name[sr]=Инсталирај систем -Icon[sr]=calamares -GenericName[sr]=Инсталатер система -Comment[sr]=Каламарес — инсталатер система -Name[sr@latin]=Instaliraj sistem Name[sk]=Inštalovať systém Icon[sk]=calamares GenericName[sk]=Inštalátor systému Comment[sk]=Calamares — Inštalátor systému Name[sl]=Namesti sistem +Name[sq]=Instalo Sistemin +Icon[sq]=calamares +GenericName[sq]=Instalues Sistemi +Comment[sq]=Calamares — Instalues Sistemi +Name[sr]=Инсталирај систем +Icon[sr]=calamares +GenericName[sr]=Инсталатер система +Comment[sr]=Каламарес — инсталатер система +Name[sr@latin]=Instaliraj sistem Name[sv]=Installera system Icon[sv]=calamares GenericName[sv]=Systeminstallerare @@ -201,6 +221,10 @@ Icon[tg]=calamares GenericName[tg]=Насбкунандаи низомӣ Comment[tg]=Calamares — Насбкунандаи низомӣ Name[th]=ติดตั้งระบบ +Name[tr_TR]=Sistemi Yükle +Icon[tr_TR]=calamares +GenericName[tr_TR]=Sistem Yükleyici +Comment[tr_TR]=Calamares — Sistem Yükleyici Name[uk]=Встановити Систему Icon[uk]=calamares GenericName[uk]=Встановлювач системи @@ -217,27 +241,3 @@ Name[zh_TW]=安裝系統 Icon[zh_TW]=calamares GenericName[zh_TW]=系統安裝程式 Comment[zh_TW]=Calamares ── 系統安裝程式 -Name[ast]=Instalar el sistema -Icon[ast]=calamares -GenericName[ast]=Instalador del sistema -Comment[ast]=Calamares — Instalador del sistema -Name[eo]=Instali Sistemo -Icon[eo]=calamares -GenericName[eo]=Sistema Instalilo -Comment[eo]=Calamares — Sistema Instalilo -Name[ne_NP]= सिस्टम इन्स्टल गर्नुहोस् -Icon[ne_NP]=Calamares -GenericName[ne_NP]=सिस्टम इन्स्टलर -Comment[ne_NP]=Calamares - सिस्टम इन्स्टलर -Name[es_MX]=Instalar el Sistema -Icon[es_MX]=calamares -GenericName[es_MX]=Instalador del sistema -Comment[es_MX]=Calamares - Instalador del sistema -Name[pt_PT]=Instalar Sistema -Icon[pt_PT]=calamares -GenericName[pt_PT]=Instalador de Sistema -Comment[pt_PT]=Instalador de Sistema - Calamares -Name[tr_TR]=Sistemi Yükle -Icon[tr_TR]=calamares -GenericName[tr_TR]=Sistem Yükleyici -Comment[tr_TR]=Calamares — Sistem Yükleyici From dc11dd2203fda01e1f78e2c29225a885c2bc7449 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 7 Dec 2021 12:24:41 +0100 Subject: [PATCH 33/99] [libcalamaresui] Move ErrorDialog to the widgets/ part --- src/libcalamaresui/CMakeLists.txt | 6 +++--- .../{utils/ErrorDialog => widgets}/ErrorDialog.cpp | 0 .../{utils/ErrorDialog => widgets}/ErrorDialog.h | 0 .../{utils/ErrorDialog => widgets}/ErrorDialog.ui | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename src/libcalamaresui/{utils/ErrorDialog => widgets}/ErrorDialog.cpp (100%) rename src/libcalamaresui/{utils/ErrorDialog => widgets}/ErrorDialog.h (100%) rename src/libcalamaresui/{utils/ErrorDialog => widgets}/ErrorDialog.ui (100%) diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt index e745681f3..ab0ad963a 100644 --- a/src/libcalamaresui/CMakeLists.txt +++ b/src/libcalamaresui/CMakeLists.txt @@ -20,7 +20,6 @@ set( calamaresui_SOURCES utils/CalamaresUtilsGui.cpp utils/ImageRegistry.cpp utils/Paste.cpp - utils/ErrorDialog/ErrorDialog.cpp viewpages/BlankViewStep.cpp viewpages/ExecutionViewStep.cpp @@ -28,6 +27,7 @@ set( calamaresui_SOURCES viewpages/ViewStep.cpp widgets/ClickableLabel.cpp + widgets/ErrorDialog.cpp widgets/FixedAspectRatioLabel.cpp widgets/PrettyRadioButton.cpp widgets/TranslationFix.cpp @@ -76,8 +76,8 @@ calamares_add_library( calamaresui Qt5::Svg RESOURCES libcalamaresui.qrc EXPORT Calamares - UI - utils/ErrorDialog/ErrorDialog.ui + UI + utils/ErrorDialog/ErrorDialog.ui VERSION ${CALAMARES_VERSION_SHORT} ) target_link_libraries( calamaresui PRIVATE yamlcpp::yamlcpp ) diff --git a/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.cpp b/src/libcalamaresui/widgets/ErrorDialog.cpp similarity index 100% rename from src/libcalamaresui/utils/ErrorDialog/ErrorDialog.cpp rename to src/libcalamaresui/widgets/ErrorDialog.cpp diff --git a/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.h b/src/libcalamaresui/widgets/ErrorDialog.h similarity index 100% rename from src/libcalamaresui/utils/ErrorDialog/ErrorDialog.h rename to src/libcalamaresui/widgets/ErrorDialog.h diff --git a/src/libcalamaresui/utils/ErrorDialog/ErrorDialog.ui b/src/libcalamaresui/widgets/ErrorDialog.ui similarity index 100% rename from src/libcalamaresui/utils/ErrorDialog/ErrorDialog.ui rename to src/libcalamaresui/widgets/ErrorDialog.ui From 49890acd041594dc5b736aea137a95873d76b595 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 7 Dec 2021 12:39:50 +0100 Subject: [PATCH 34/99] [libcalamaresui] Fix build after move --- src/libcalamaresui/ViewManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index 87024ea6b..e61859a13 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -17,7 +17,6 @@ #include "JobQueue.h" #include "Settings.h" -#include "utils/ErrorDialog/ErrorDialog.h" #include "utils/Logger.h" #include "utils/Paste.h" #include "utils/Retranslator.h" @@ -25,6 +24,7 @@ #include "viewpages/BlankViewStep.h" #include "viewpages/ExecutionViewStep.h" #include "viewpages/ViewStep.h" +#include "widgets/ErrorDialog.h" #include "widgets/TranslationFix.h" #include From ca7f28848827ea60f64a2882719826e52b0933bc Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 7 Dec 2021 12:40:05 +0100 Subject: [PATCH 35/99] [libcalamaresui] APIDOX for ErrorDialog --- src/libcalamaresui/widgets/ErrorDialog.h | 43 ++++++++++++++++-------- 1 file changed, 29 insertions(+), 14 deletions(-) diff --git a/src/libcalamaresui/widgets/ErrorDialog.h b/src/libcalamaresui/widgets/ErrorDialog.h index a0126c2ce..c4949a89c 100644 --- a/src/libcalamaresui/widgets/ErrorDialog.h +++ b/src/libcalamaresui/widgets/ErrorDialog.h @@ -7,17 +7,16 @@ * */ -#ifndef ERRORDIALOG_H -#define ERRORDIALOG_H +#ifndef LIBCALAMARESUI_ERRORDIALOG_H +#define LIBCALAMARESUI_ERRORDIALOG_H #include - namespace Ui { class ErrorDialog; } -class QDialogButtonBox; + namespace Calamares { class ErrorDialog : public QDialog @@ -32,30 +31,46 @@ class ErrorDialog : public QDialog public: explicit ErrorDialog( QWidget* parent = nullptr ); - ~ErrorDialog(); + ~ErrorDialog() override; + /** @brief The heading (title) of the error dialog + * + * This is a short (one-line) title. It is human-readable, so should + * be translated at the time it is set. + */ QString heading() const; - - QString informativeText() const; - - QString details() const; - void setHeading( const QString& newHeading ); + /** @brief The description of the problem + * + * Longer, human-readable, description of the problem. This text + * is word-wrapped as necessary. + */ + QString informativeText() const; void setInformativeText( const QString& newInformativeText ); + /** @brief Details of the problem + * + * This is generally command-output; it might not be translated + * when set. It should be considered "background to the informative + * text", or maybe "the reasons". Write the informative text for + * the end-user. + */ + QString details() const; void setDetails( const QString& newDetails ); + /** @brief Enable web-paste button + * + * The web-paste button can be configured at a global level, + * but each individual error dialog can be set separately. + */ bool shouldOfferWebPaste() const; void setShouldOfferWebPaste( bool newShouldOfferWebPaste ); signals: void headingChanged(); - void informativeTextChanged(); - void detailsChanged(); - void shouldOfferWebPasteChanged(); private: @@ -65,4 +80,4 @@ private: }; // namespace Calamares -#endif // ERRORDIALOG_H +#endif // LIBCALAMARESUI_ERRORDIALOG_H From 2f9edb3e08019ed7db413daeffe79066822c8543 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 7 Dec 2021 12:44:19 +0100 Subject: [PATCH 36/99] [libcalamaresui] Code style --- src/libcalamaresui/widgets/ErrorDialog.cpp | 52 +++++++++++----------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/src/libcalamaresui/widgets/ErrorDialog.cpp b/src/libcalamaresui/widgets/ErrorDialog.cpp index 4ffe20384..8c682f964 100644 --- a/src/libcalamaresui/widgets/ErrorDialog.cpp +++ b/src/libcalamaresui/widgets/ErrorDialog.cpp @@ -17,7 +17,6 @@ namespace Calamares { - ErrorDialog::ErrorDialog( QWidget* parent ) : QDialog( parent ) , ui( new Ui::ErrorDialog ) @@ -33,7 +32,6 @@ ErrorDialog::~ErrorDialog() delete ui; } - QString ErrorDialog::heading() const { @@ -55,31 +53,32 @@ ErrorDialog::details() const void ErrorDialog::setHeading( const QString& newHeading ) { - if ( ui->headingLabel->text() == newHeading ) - return; - ui->headingLabel->setText( newHeading ); - emit headingChanged(); + if ( ui->headingLabel->text() != newHeading ) + { + ui->headingLabel->setText( newHeading ); + emit headingChanged(); + } } void ErrorDialog::setInformativeText( const QString& newInformativeText ) { - if ( ui->informativeTextLabel->text() == newInformativeText ) - return; - ui->informativeTextLabel->setText( newInformativeText ); - emit informativeTextChanged(); + if ( ui->informativeTextLabel->text() != newInformativeText ) + { + ui->informativeTextLabel->setText( newInformativeText ); + emit informativeTextChanged(); + } } void ErrorDialog::setDetails( const QString& newDetails ) { - if ( ui->detailsBrowser->toPlainText() == newDetails ) - return; - ui->detailsBrowser->setPlainText( newDetails ); - - ui->detailsWidget->setVisible( !ui->detailsBrowser->toPlainText().trimmed().isEmpty() ); - - emit detailsChanged(); + if ( ui->detailsBrowser->toPlainText() != newDetails ) + { + ui->detailsBrowser->setPlainText( newDetails ); + ui->detailsWidget->setVisible( !ui->detailsBrowser->toPlainText().trimmed().isEmpty() ); + emit detailsChanged(); + } } bool @@ -91,18 +90,17 @@ ErrorDialog::shouldOfferWebPaste() const void ErrorDialog::setShouldOfferWebPaste( bool newShouldOfferWebPaste ) { - if ( m_shouldOfferWebPaste == newShouldOfferWebPaste ) - return; - m_shouldOfferWebPaste = newShouldOfferWebPaste; + if ( m_shouldOfferWebPaste != newShouldOfferWebPaste ) + { + m_shouldOfferWebPaste = newShouldOfferWebPaste; - ui->offerWebPasteLabel->setVisible( m_shouldOfferWebPaste ); + ui->offerWebPasteLabel->setVisible( m_shouldOfferWebPaste ); + ui->buttonBox->setStandardButtons( m_shouldOfferWebPaste ? ( QDialogButtonBox::Yes | QDialogButtonBox::No ) + : QDialogButtonBox::Close ); + fixButtonLabels( ui->buttonBox ); - ui->buttonBox->setStandardButtons( m_shouldOfferWebPaste ? ( QDialogButtonBox::Yes | QDialogButtonBox::No ) - : QDialogButtonBox::Close ); - - fixButtonLabels( ui->buttonBox ); - - emit shouldOfferWebPasteChanged(); + emit shouldOfferWebPasteChanged(); + } } } // namespace Calamares From 3234de5753faaed5760a2354fbaa5e09614de3c3 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 7 Dec 2021 12:48:17 +0100 Subject: [PATCH 37/99] [libcalamaresui] Make web-paste decision more readable --- src/libcalamaresui/ViewManager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index e61859a13..5d4109ca2 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -152,9 +152,9 @@ ViewManager::insertViewStep( int before, ViewStep* step ) void ViewManager::onInstallationFailed( const QString& message, const QString& details ) { - bool shouldOfferWebPaste = std::get< 0 >( Calamares::Branding::instance()->uploadServer() ) - != Calamares::Branding::UploadServerType::None - and std::get< 2 >( Calamares::Branding::instance()->uploadServer() ) != 0; + const auto webPaste = Calamares::Branding::instance()->uploadServer(); + bool shouldOfferWebPaste + = std::get< 0 >( webPaste ) != Calamares::Branding::UploadServerType::None and std::get< 2 >( webPaste ) != 0; cError() << "Installation failed:" << message; cDebug() << Logger::SubEntry << "- message:" << message; From b07c9bb4af8f202a741286d2068e7e116a332c48 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 7 Dec 2021 12:53:43 +0100 Subject: [PATCH 38/99] [libcalamaresui] Use meaningful type for Upload info - use a struct with named fields instead of a tuple - offer an operator bool() for the logic of does-it-make-sense-to-upload --- src/libcalamaresui/Branding.cpp | 7 ++++--- src/libcalamaresui/Branding.h | 9 ++++++++- src/libcalamaresui/ViewManager.cpp | 4 +--- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/libcalamaresui/Branding.cpp b/src/libcalamaresui/Branding.cpp index 5894c723d..b723f5dc7 100644 --- a/src/libcalamaresui/Branding.cpp +++ b/src/libcalamaresui/Branding.cpp @@ -162,14 +162,15 @@ uploadServerFromMap( const QVariantMap& map ) if ( typestring.isEmpty() || urlstring.isEmpty() ) { - return Branding::UploadServerInfo( Branding::UploadServerType::None, QUrl(), 0 ); + return Branding::UploadServerInfo { Branding::UploadServerType::None, QUrl(), 0 }; } bool bogus = false; // we don't care about type-name lookup success here - return Branding::UploadServerInfo( + return Branding::UploadServerInfo { names.find( typestring, bogus ), QUrl( urlstring, QUrl::ParsingMode::StrictMode ), - sizeLimitKiB >= 0 ? CalamaresUtils::KiBtoBytes( static_cast< unsigned long long >( sizeLimitKiB ) ) : -1 ); + sizeLimitKiB >= 0 ? CalamaresUtils::KiBtoBytes( static_cast< unsigned long long >( sizeLimitKiB ) ) : -1 + }; } /** @brief Load the @p map with strings from @p config diff --git a/src/libcalamaresui/Branding.h b/src/libcalamaresui/Branding.h index ba49f87c3..899b14c78 100644 --- a/src/libcalamaresui/Branding.h +++ b/src/libcalamaresui/Branding.h @@ -227,7 +227,14 @@ public: * is irrelevant and usually empty), the URL for the upload and the size limit of upload * in bytes (for configuration value < 0, it serves -1, which stands for having no limit). */ - using UploadServerInfo = std::tuple< UploadServerType, QUrl, qint64 >; + struct UploadServerInfo + { + UploadServerType type; + QUrl url; + qint64 size; + + operator bool() const { return type != Calamares::Branding::UploadServerType::None && size != 0; } + }; UploadServerInfo uploadServer() const { return m_uploadServer; } /** diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index 5d4109ca2..0c0e324a1 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -152,9 +152,7 @@ ViewManager::insertViewStep( int before, ViewStep* step ) void ViewManager::onInstallationFailed( const QString& message, const QString& details ) { - const auto webPaste = Calamares::Branding::instance()->uploadServer(); - bool shouldOfferWebPaste - = std::get< 0 >( webPaste ) != Calamares::Branding::UploadServerType::None and std::get< 2 >( webPaste ) != 0; + bool shouldOfferWebPaste = bool( Calamares::Branding::instance()->uploadServer() ); cError() << "Installation failed:" << message; cDebug() << Logger::SubEntry << "- message:" << message; From 3030a710cce93646f558be27355a04b57c440443 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 7 Dec 2021 12:58:22 +0100 Subject: [PATCH 39/99] [libcalamaresui] Simplify --- src/libcalamaresui/ViewManager.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/libcalamaresui/ViewManager.cpp b/src/libcalamaresui/ViewManager.cpp index 0c0e324a1..44afafb15 100644 --- a/src/libcalamaresui/ViewManager.cpp +++ b/src/libcalamaresui/ViewManager.cpp @@ -152,8 +152,6 @@ ViewManager::insertViewStep( int before, ViewStep* step ) void ViewManager::onInstallationFailed( const QString& message, const QString& details ) { - bool shouldOfferWebPaste = bool( Calamares::Branding::instance()->uploadServer() ); - cError() << "Installation failed:" << message; cDebug() << Logger::SubEntry << "- message:" << message; cDebug() << Logger::SubEntry << "- details:" << Logger::NoQuote << details; @@ -165,7 +163,7 @@ ViewManager::onInstallationFailed( const QString& message, const QString& detail errorDialog->setWindowTitle( tr( "Error" ) ); errorDialog->setHeading( "" + heading + "" ); errorDialog->setInformativeText( message ); - errorDialog->setShouldOfferWebPaste( shouldOfferWebPaste ); + errorDialog->setShouldOfferWebPaste( Calamares::Branding::instance()->uploadServer() ); errorDialog->setDetails( details ); errorDialog->show(); From 8b804c4ae04bf2844a05c8ff679acfafae47c098 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 7 Dec 2021 14:15:43 +0100 Subject: [PATCH 40/99] [libcalamaresui] Improve icon+heading layout - Icon was too wide, heading and message placed off to the side --- src/libcalamaresui/widgets/ErrorDialog.ui | 87 +++++++++++++---------- 1 file changed, 50 insertions(+), 37 deletions(-) diff --git a/src/libcalamaresui/widgets/ErrorDialog.ui b/src/libcalamaresui/widgets/ErrorDialog.ui index 2632af617..cb480034e 100644 --- a/src/libcalamaresui/widgets/ErrorDialog.ui +++ b/src/libcalamaresui/widgets/ErrorDialog.ui @@ -11,25 +11,25 @@ - Dialog + Dialog - - - - - 0 - 0 - - - - - - - - + + + + + + 0 + 0 + + + + + + + @@ -43,27 +43,17 @@ - - - - - 0 - 0 - + + + + - + Would you like to paste the install log to the web? - - - - - - - - + Qt::Horizontal @@ -73,12 +63,35 @@ - - - - Would you like to paste the install log to the web? - - + + + + + + + 0 + 0 + + + + + + + + + + + + 0 + 0 + + + + + + + + From c2e63f4a6bad3dae76d72690e721950eb793177b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 7 Dec 2021 14:20:31 +0100 Subject: [PATCH 41/99] [libcalamaresui] Don't bother tagging nonexistent 3rdparty sources --- src/libcalamaresui/CMakeLists.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/libcalamaresui/CMakeLists.txt b/src/libcalamaresui/CMakeLists.txt index e745681f3..c5101cb61 100644 --- a/src/libcalamaresui/CMakeLists.txt +++ b/src/libcalamaresui/CMakeLists.txt @@ -40,8 +40,6 @@ set( calamaresui_SOURCES # Don't warn about third-party sources mark_thirdparty_code( - ${CMAKE_SOURCE_DIR}/3rdparty/qjsonitem.cpp - ${CMAKE_SOURCE_DIR}/3rdparty/qjsonmodel.cpp ${CMAKE_SOURCE_DIR}/3rdparty/waitingspinnerwidget.cpp ) @@ -76,8 +74,8 @@ calamares_add_library( calamaresui Qt5::Svg RESOURCES libcalamaresui.qrc EXPORT Calamares - UI - utils/ErrorDialog/ErrorDialog.ui + UI + utils/ErrorDialog/ErrorDialog.ui VERSION ${CALAMARES_VERSION_SHORT} ) target_link_libraries( calamaresui PRIVATE yamlcpp::yamlcpp ) From 0b6239a9961ba32560cbf6c931ef553b9cb0b15c Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 7 Dec 2021 14:28:43 +0100 Subject: [PATCH 42/99] [libcalamaresui] Warnings-- : we know TCP ports are 16 bit --- src/libcalamaresui/utils/Paste.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp index 519dc0133..d782d138e 100644 --- a/src/libcalamaresui/utils/Paste.cpp +++ b/src/libcalamaresui/utils/Paste.cpp @@ -69,7 +69,8 @@ STATICTEST QString ficheLogUpload( const QByteArray& pasteData, const QUrl& serverUrl, QObject* parent ) { QTcpSocket* socket = new QTcpSocket( parent ); - socket->connectToHost( serverUrl.host(), serverUrl.port() ); + // 16 bits of port-number + socket->connectToHost( serverUrl.host(), quint16( serverUrl.port() ) ); if ( !socket->waitForConnected() ) { From 32da51b44cae6fe560f860172da574aeda6ad661 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 7 Dec 2021 14:48:14 +0100 Subject: [PATCH 43/99] [libcalamares] Avoid warnings in Boost::Python macros --- src/libcalamares/PythonJob.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/libcalamares/PythonJob.cpp b/src/libcalamares/PythonJob.cpp index 291adbc54..b1373f5f3 100644 --- a/src/libcalamares/PythonJob.cpp +++ b/src/libcalamares/PythonJob.cpp @@ -23,6 +23,11 @@ static const char* s_preScript = nullptr; namespace bp = boost::python; +#ifdef __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdisabled-macro-expansion" +#endif + BOOST_PYTHON_FUNCTION_OVERLOADS( mount_overloads, CalamaresPython::mount, 2, 4 ); BOOST_PYTHON_FUNCTION_OVERLOADS( target_env_call_str_overloads, CalamaresPython::target_env_call, 1, 3 ); BOOST_PYTHON_FUNCTION_OVERLOADS( target_env_call_list_overloads, CalamaresPython::target_env_call, 1, 3 ); @@ -42,6 +47,10 @@ BOOST_PYTHON_FUNCTION_OVERLOADS( target_env_process_output_overloads, 4 ); BOOST_PYTHON_FUNCTION_OVERLOADS( host_env_process_output_overloads, CalamaresPython::host_env_process_output, 1, 4 ); +#ifdef __clang__ +#pragma clang diagnostic pop +#endif + BOOST_PYTHON_MODULE( libcalamares ) { bp::object package = bp::scope(); From eda85c176afe2781bc9ef0d5566d3d1fd7cc26f3 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 7 Dec 2021 15:01:29 +0100 Subject: [PATCH 44/99] [tracking] Avoid unused-deprecated-methods warnings - these are internal classes, with no real Qt machinery; remove the Q_OBJECT macros. - replace the tr() calls with calls with an explicit context, so that translations do not change. --- src/modules/tracking/TrackingJobs.cpp | 54 +++++++++++++++------------ 1 file changed, 30 insertions(+), 24 deletions(-) diff --git a/src/modules/tracking/TrackingJobs.cpp b/src/modules/tracking/TrackingJobs.cpp index 5e3cd12b5..7430bd57b 100644 --- a/src/modules/tracking/TrackingJobs.cpp +++ b/src/modules/tracking/TrackingJobs.cpp @@ -19,6 +19,8 @@ #include +#include + #include @@ -37,7 +39,6 @@ namespace */ class TrackingInstallJob : public Calamares::Job { - Q_OBJECT public: TrackingInstallJob( const QString& url ); ~TrackingInstallJob() override; @@ -58,7 +59,6 @@ private: */ class TrackingMachineUpdateManagerJob : public Calamares::Job { - Q_OBJECT public: ~TrackingMachineUpdateManagerJob() override; @@ -75,7 +75,6 @@ public: */ class TrackingKUserFeedbackJob : public Calamares::Job { - Q_OBJECT public: TrackingKUserFeedbackJob( const QString& username, const QStringList& areas ); ~TrackingKUserFeedbackJob() override; @@ -99,13 +98,13 @@ TrackingInstallJob::~TrackingInstallJob() {} QString TrackingInstallJob::prettyName() const { - return tr( "Installation feedback" ); + return QCoreApplication::translate( "TrackingInstallJob", "Installation feedback" ); } QString TrackingInstallJob::prettyStatusMessage() const { - return tr( "Sending installation feedback." ); + return QCoreApplication::translate( "TrackingInstallJob", "Sending installation feedback." ); } Calamares::JobResult @@ -122,8 +121,9 @@ TrackingInstallJob::exec() if ( result.status == RequestStatus::Timeout ) { cWarning() << "install-tracking request timed out."; - return Calamares::JobResult::error( tr( "Internal error in install-tracking." ), - tr( "HTTP request timed out." ) ); + return Calamares::JobResult::error( + QCoreApplication::translate( "TrackingInstallJob", "Internal error in install-tracking." ), + QCoreApplication::translate( "TrackingInstallJob", "HTTP request timed out." ) ); } return Calamares::JobResult::ok(); } @@ -133,13 +133,13 @@ TrackingMachineUpdateManagerJob::~TrackingMachineUpdateManagerJob() {} QString TrackingMachineUpdateManagerJob::prettyName() const { - return tr( "Machine feedback" ); + return QCoreApplication::translate( "TrackingMachineUpdateManagerJob", "Machine feedback" ); } QString TrackingMachineUpdateManagerJob::prettyStatusMessage() const { - return tr( "Configuring machine feedback." ); + return QCoreApplication::translate( "TrackingMachineUpdateManagerJob", "Configuring machine feedback." ); } Calamares::JobResult @@ -162,14 +162,20 @@ TrackingMachineUpdateManagerJob::exec() else if ( r > 0 ) { return Calamares::JobResult::error( - tr( "Error in machine feedback configuration." ), - tr( "Could not configure machine feedback correctly, script error %1." ).arg( r ) ); + QCoreApplication::translate( "TrackingMachineUpdateManagerJob", + "Error in machine feedback configuration." ), + QCoreApplication::translate( "TrackingMachineUpdateManagerJob", + "Could not configure machine feedback correctly, script error %1." ) + .arg( r ) ); } else { return Calamares::JobResult::error( - tr( "Error in machine feedback configuration." ), - tr( "Could not configure machine feedback correctly, Calamares error %1." ).arg( r ) ); + QCoreApplication::translate( "TrackingMachineUpdateManagerJob", + "Error in machine feedback configuration." ), + QCoreApplication::translate( "TrackingMachineUpdateManagerJob", + "Could not configure machine feedback correctly, Calamares error %1." ) + .arg( r ) ); } } @@ -184,13 +190,13 @@ TrackingKUserFeedbackJob::~TrackingKUserFeedbackJob() {} QString TrackingKUserFeedbackJob::prettyName() const { - return tr( "KDE user feedback" ); + return QCoreApplication::translate( "TrackingKUserFeedbackJob", "KDE user feedback" ); } QString TrackingKUserFeedbackJob::prettyStatusMessage() const { - return tr( "Configuring KDE user feedback." ); + return QCoreApplication::translate( "TrackingKUserFeedbackJob", "Configuring KDE user feedback." ); } Calamares::JobResult @@ -212,21 +218,25 @@ FeedbackLevel=16 if ( r > 0 ) { return Calamares::JobResult::error( - tr( "Error in KDE user feedback configuration." ), - tr( "Could not configure KDE user feedback correctly, script error %1." ).arg( r ) ); + QCoreApplication::translate( "TrackingKUserFeedbackJob", "Error in KDE user feedback configuration." ), + QCoreApplication::translate( "TrackingKUserFeedbackJob", + "Could not configure KDE user feedback correctly, script error %1." ) + .arg( r ) ); } else if ( r < 0 ) { return Calamares::JobResult::error( - tr( "Error in KDE user feedback configuration." ), - tr( "Could not configure KDE user feedback correctly, Calamares error %1." ).arg( r ) ); + QCoreApplication::translate( "TrackingKUserFeedbackJob", "Error in KDE user feedback configuration." ), + QCoreApplication::translate( "TrackingKUserFeedbackJob", + "Could not configure KDE user feedback correctly, Calamares error %1." ) + .arg( r ) ); } } return Calamares::JobResult::ok(); } -} // namespace +} // namespace void addJob( Calamares::JobList& list, InstallTrackingConfig* config ) @@ -290,7 +300,3 @@ addJob( Calamares::JobList& list, UserTrackingConfig* config ) } } } - -#include "utils/moc-warnings.h" - -#include "TrackingJobs.moc" From 5b0511035164e17c2da787f1183370b4892a8bac Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 7 Dec 2021 15:29:02 +0100 Subject: [PATCH 45/99] [partition] Add convenience function formatByteSize We want to use the KPMCore function consistently, but Calamares uses a qint64 most of the time. Centralize the cast to double in one place in the code. --- src/modules/partition/core/SizeUtils.h | 27 ++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 src/modules/partition/core/SizeUtils.h diff --git a/src/modules/partition/core/SizeUtils.h b/src/modules/partition/core/SizeUtils.h new file mode 100644 index 000000000..d474656c9 --- /dev/null +++ b/src/modules/partition/core/SizeUtils.h @@ -0,0 +1,27 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2021 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +#ifndef PARTITION_CORE_SIZEUTILS_H +#define PARTITION_CORE_SIZEUTILS_H + +#include + +/** @brief Helper function for printing sizes consistently. + * + * Most of Calamares uses a qint64 for partition sizes, so use that + * parameter type. However, the human-visible formatting doesn't need + * to bother with one-byte accuracy (and anyway, a double has at least 50 bits + * at which point we're printing giga (or gibi) bytes). + */ +static inline QString formatByteSize( qint64 sizeValue ) +{ + return Capacity::formatByteSize( static_cast< double >( sizeValue ) ); +} + +#endif // PARTITION_CORE_SIZEUTILS_H From bb3f4442f5f5e203a3c0ce673cd362aadb02882c Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 7 Dec 2021 15:30:21 +0100 Subject: [PATCH 46/99] [partition] Warnings-reduction - use consistent size-formatting - needs an out-of-line virtual function --- src/modules/partition/gui/ListPhysicalVolumeWidgetItem.cpp | 7 ++++--- src/modules/partition/gui/ListPhysicalVolumeWidgetItem.h | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/modules/partition/gui/ListPhysicalVolumeWidgetItem.cpp b/src/modules/partition/gui/ListPhysicalVolumeWidgetItem.cpp index 1e8a9e573..8eeafcbf4 100644 --- a/src/modules/partition/gui/ListPhysicalVolumeWidgetItem.cpp +++ b/src/modules/partition/gui/ListPhysicalVolumeWidgetItem.cpp @@ -9,11 +9,10 @@ #include "ListPhysicalVolumeWidgetItem.h" -#include +#include "core/SizeUtils.h" ListPhysicalVolumeWidgetItem::ListPhysicalVolumeWidgetItem( const Partition* partition, bool checked ) - : QListWidgetItem( - QString( "%1 | %2" ).arg( partition->deviceNode(), Capacity::formatByteSize( partition->capacity() ) ) ) + : QListWidgetItem( QString( "%1 | %2" ).arg( partition->deviceNode(), formatByteSize( partition->capacity() ) ) ) , m_partition( partition ) { setToolTip( partition->deviceNode() ); @@ -26,3 +25,5 @@ ListPhysicalVolumeWidgetItem::partition() const { return m_partition; } + +ListPhysicalVolumeWidgetItem::~ListPhysicalVolumeWidgetItem() {} diff --git a/src/modules/partition/gui/ListPhysicalVolumeWidgetItem.h b/src/modules/partition/gui/ListPhysicalVolumeWidgetItem.h index 6e0b1c85a..5d7fdcb76 100644 --- a/src/modules/partition/gui/ListPhysicalVolumeWidgetItem.h +++ b/src/modules/partition/gui/ListPhysicalVolumeWidgetItem.h @@ -18,6 +18,7 @@ class ListPhysicalVolumeWidgetItem : public QListWidgetItem { public: ListPhysicalVolumeWidgetItem( const Partition* partition, bool checked ); + ~ListPhysicalVolumeWidgetItem() override; const Partition* partition() const; From 09a03fbbc0356f1fdd24de28715f4b8dc183d236 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 7 Dec 2021 15:31:49 +0100 Subject: [PATCH 47/99] [partition] Warnings--: we don't care about one-byte-in-10^12 --- src/modules/partition/gui/ReplaceWidget.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/modules/partition/gui/ReplaceWidget.cpp b/src/modules/partition/gui/ReplaceWidget.cpp index 94f527646..2e5675a11 100644 --- a/src/modules/partition/gui/ReplaceWidget.cpp +++ b/src/modules/partition/gui/ReplaceWidget.cpp @@ -212,7 +212,8 @@ ReplaceWidget::onPartitionSelected() } } - if ( partition->capacity() < requiredSpaceB ) + // The loss of precision is ok; we're not going to fall over from a single byte + if ( static_cast< double >( partition->capacity() ) < requiredSpaceB ) { updateStatus( CalamaresUtils::Fail, tr( "%4

" From 6e715205d785f63a997d48aaa59d9be6de44705b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 7 Dec 2021 15:36:11 +0100 Subject: [PATCH 48/99] [partition] Warnings-- by calling formatting consistently --- src/modules/partition/core/DeviceModel.cpp | 8 +++----- src/modules/partition/core/PartitionModel.cpp | 10 ++++------ src/modules/partition/gui/PartitionLabelsView.cpp | 5 ++--- src/modules/partition/gui/VolumeGroupBaseDialog.cpp | 7 +++---- 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/src/modules/partition/core/DeviceModel.cpp b/src/modules/partition/core/DeviceModel.cpp index 33aae20c0..25bdbff6c 100644 --- a/src/modules/partition/core/DeviceModel.cpp +++ b/src/modules/partition/core/DeviceModel.cpp @@ -8,9 +8,10 @@ * Calamares is Free Software: see the License-Identifier above. * */ -#include "core/DeviceModel.h" +#include "DeviceModel.h" #include "core/PartitionModel.h" +#include "core/SizeUtils.h" #include "utils/CalamaresUtilsGui.h" #include "utils/Logger.h" @@ -18,9 +19,6 @@ // KPMcore #include -// KF5 -#include - #include #include @@ -83,7 +81,7 @@ DeviceModel::data( const QModelIndex& index, int role ) const //: device[name] - size[number] (device-node[name]) return tr( "%1 - %2 (%3)" ) .arg( device->name() ) - .arg( KFormat().formatByteSize( device->capacity() ) ) + .arg( formatByteSize( device->capacity() ) ) .arg( device->deviceNode() ); } else diff --git a/src/modules/partition/core/PartitionModel.cpp b/src/modules/partition/core/PartitionModel.cpp index e310eee5e..19dbcd076 100644 --- a/src/modules/partition/core/PartitionModel.cpp +++ b/src/modules/partition/core/PartitionModel.cpp @@ -8,11 +8,12 @@ * */ -#include "core/PartitionModel.h" +#include "PartitionModel.h" #include "core/ColorUtils.h" #include "core/KPMHelpers.h" #include "core/PartitionInfo.h" +#include "core/SizeUtils.h" #include "partition/FileSystem.h" #include "partition/PartitionQuery.h" @@ -24,9 +25,6 @@ #include #include -// KF5 -#include - // Qt #include @@ -178,7 +176,7 @@ PartitionModel::data( const QModelIndex& index, int role ) const if ( col == SizeColumn ) { qint64 size = ( partition->lastSector() - partition->firstSector() + 1 ) * m_device->logicalSize(); - return KFormat().formatByteSize( size ); + return formatByteSize( size ); } cDebug() << "Unknown column" << col; return QVariant(); @@ -210,7 +208,7 @@ PartitionModel::data( const QModelIndex& index, int role ) const QString prettyFileSystem = CalamaresUtils::Partition::prettyNameForFileSystemType( partition->fileSystem().type() ); qint64 size = ( partition->lastSector() - partition->firstSector() + 1 ) * m_device->logicalSize(); - QString prettySize = KFormat().formatByteSize( size ); + QString prettySize = formatByteSize( size ); return QVariant( name + " " + prettyFileSystem + " " + prettySize ); } case SizeRole: diff --git a/src/modules/partition/gui/PartitionLabelsView.cpp b/src/modules/partition/gui/PartitionLabelsView.cpp index 5803d59a2..e73d7f4af 100644 --- a/src/modules/partition/gui/PartitionLabelsView.cpp +++ b/src/modules/partition/gui/PartitionLabelsView.cpp @@ -12,6 +12,7 @@ #include "core/ColorUtils.h" #include "core/PartitionModel.h" +#include "core/SizeUtils.h" #include "utils/CalamaresUtilsGui.h" #include "utils/Logger.h" @@ -20,8 +21,6 @@ #include #include -#include - // Qt #include #include @@ -39,7 +38,7 @@ static QStringList buildUnknownDisklabelTexts( Device* dev ) { QStringList texts = { QObject::tr( "Unpartitioned space or unknown partition table" ), - KFormat().formatByteSize( dev->totalLogical() * dev->logicalSize() ) }; + formatByteSize( dev->totalLogical() * dev->logicalSize() ) }; return texts; } diff --git a/src/modules/partition/gui/VolumeGroupBaseDialog.cpp b/src/modules/partition/gui/VolumeGroupBaseDialog.cpp index 6277c30e5..48b44f68d 100644 --- a/src/modules/partition/gui/VolumeGroupBaseDialog.cpp +++ b/src/modules/partition/gui/VolumeGroupBaseDialog.cpp @@ -10,10 +10,9 @@ #include "VolumeGroupBaseDialog.h" #include "ui_VolumeGroupBaseDialog.h" +#include "core/SizeUtils.h" #include "gui/ListPhysicalVolumeWidgetItem.h" -#include - #include #include #include @@ -100,7 +99,7 @@ VolumeGroupBaseDialog::setUsedSizeValue( qint64 usedSize ) { m_usedSizeValue = usedSize; - ui->usedSize->setText( Capacity::formatByteSize( m_usedSizeValue ) ); + ui->usedSize->setText( formatByteSize( m_usedSizeValue ) ); } void @@ -121,7 +120,7 @@ VolumeGroupBaseDialog::updateTotalSize() % ( ui->peSize->value() * Capacity::unitFactor( Capacity::Unit::Byte, Capacity::Unit::MiB ) ); } - ui->totalSize->setText( Capacity::formatByteSize( m_totalSizeValue ) ); + ui->totalSize->setText( formatByteSize( m_totalSizeValue ) ); updateTotalSectors(); } From 4611545f93a2aafe8aea927a547c0df59c1f804c Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 7 Dec 2021 15:42:14 +0100 Subject: [PATCH 49/99] [libcalamares] Warnings-- on switch() - some switch statements handle a bunch of items explicitly, then default the rest. Clang complains about that. Turn off the warning for these specific switches, since there's dozens of values that simply do not need to be handled. --- src/libcalamares/PythonHelper.cpp | 8 ++++++++ src/libcalamares/partition/FileSystem.cpp | 16 ++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/src/libcalamares/PythonHelper.cpp b/src/libcalamares/PythonHelper.cpp index d6e61b3aa..ca004ab5f 100644 --- a/src/libcalamares/PythonHelper.cpp +++ b/src/libcalamares/PythonHelper.cpp @@ -26,6 +26,11 @@ namespace CalamaresPython boost::python::object variantToPyObject( const QVariant& variant ) { +#ifdef __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wswitch-enum" +#endif + // 49 enumeration values not handled switch ( variant.type() ) { case QVariant::Map: @@ -62,6 +67,9 @@ variantToPyObject( const QVariant& variant ) default: return bp::object(); } +#ifdef __clang__ +#pragma clang diagnostic pop +#endif } diff --git a/src/libcalamares/partition/FileSystem.cpp b/src/libcalamares/partition/FileSystem.cpp index ad4df31ed..0dcd6fd32 100644 --- a/src/libcalamares/partition/FileSystem.cpp +++ b/src/libcalamares/partition/FileSystem.cpp @@ -22,6 +22,11 @@ namespace Partition QString prettyNameForFileSystemType( FileSystem::Type t ) { +#ifdef __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wswitch-enum" +#endif + // 13 enumeration values not handled switch ( t ) { case FileSystem::Unknown: @@ -60,11 +65,19 @@ prettyNameForFileSystemType( FileSystem::Type t ) default: return FileSystem::nameForType( t ); } +#ifdef __clang__ +#pragma clang diagnostic pop +#endif } QString untranslatedFS( FileSystem::Type t ) { +#ifdef __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wswitch-enum" +#endif + // 34 enumeration values not handled switch ( t ) { case FileSystem::Type::ReiserFS: @@ -72,6 +85,9 @@ untranslatedFS( FileSystem::Type t ) default: return FileSystem::nameForType( t, { QStringLiteral( "C" ) } ); } +#ifdef __clang__ +#pragma clang diagnostic pop +#endif } } // namespace Partition From 09f47b576285001ca2fabb7e034d66b5a5404b91 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 7 Dec 2021 15:51:45 +0100 Subject: [PATCH 50/99] [partition] Build tests with consistent flags (in particular, KPMCore4-API flags) --- src/modules/partition/tests/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/modules/partition/tests/CMakeLists.txt b/src/modules/partition/tests/CMakeLists.txt index 2839270fb..da017d96f 100644 --- a/src/modules/partition/tests/CMakeLists.txt +++ b/src/modules/partition/tests/CMakeLists.txt @@ -61,6 +61,7 @@ calamares_add_test( SOURCES ${PartitionModule_SOURCE_DIR}/jobs/AutoMountManagementJob.cpp AutoMountTests.cpp + DEFINITIONS ${_partition_defs} ) calamares_add_test( @@ -70,4 +71,5 @@ calamares_add_test( ${PartitionModule_SOURCE_DIR}/core/DeviceList.cpp LIBRARIES kpmcore + DEFINITIONS ${_partition_defs} ) From 1197d8c750ad20bedf7d3a9ed3c55c77ec7bf13a Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 7 Dec 2021 18:19:32 +0100 Subject: [PATCH 51/99] [interactiveterminal] Warnings-- with KF5 5.86-or-later --- .../InteractiveTerminalPage.cpp | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/src/modules/interactiveterminal/InteractiveTerminalPage.cpp b/src/modules/interactiveterminal/InteractiveTerminalPage.cpp index afd39936b..ea30c21ef 100644 --- a/src/modules/interactiveterminal/InteractiveTerminalPage.cpp +++ b/src/modules/interactiveterminal/InteractiveTerminalPage.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include #include @@ -41,8 +42,10 @@ InteractiveTerminalPage::InteractiveTerminalPage( QWidget* parent ) void InteractiveTerminalPage::errorKonsoleNotInstalled() { - QMessageBox mb(QMessageBox::Critical, - tr( "Konsole not installed" ), tr( "Please install KDE Konsole and try again!" ), QMessageBox::Ok ); + QMessageBox mb( QMessageBox::Critical, + tr( "Konsole not installed" ), + tr( "Please install KDE Konsole and try again!" ), + QMessageBox::Ok ); Calamares::fixButtonLabels( &mb ); mb.exec(); } @@ -54,20 +57,30 @@ InteractiveTerminalPage::onActivate() { return; } - // For whatever reason, instead of simply linking against a library we - // need to do a runtime query to KService just to get a sodding terminal - // widget. + +#if KCOREADDONS_VERSION_MAJOR != 5 +#error Incompatible with not-KF5 +#endif +#if KCOREADDONS_VERSION_MINOR >= 86 + // 5.86 deprecated a bunch of KService and PluginFactory and related methods + auto md = KPluginMetaData::findPluginById( QString(), "konsolepart" ); + if ( !md.isValid() ) + { + errorKonsoleNotInstalled(); + return; + } + auto* p = KPluginFactory::instantiatePlugin< KParts::ReadOnlyPart >( md, this ).plugin; +#else KService::Ptr service = KService::serviceByDesktopName( "konsolepart" ); if ( !service ) { - // And all of this hoping the Konsole application is installed. If not, - // tough cookies. errorKonsoleNotInstalled(); return; } // Create one instance of konsolepart. KParts::ReadOnlyPart* p = service->createInstance< KParts::ReadOnlyPart >( this, this, {} ); +#endif if ( !p ) { // One more opportunity for the loading operation to fail. @@ -91,7 +104,6 @@ InteractiveTerminalPage::onActivate() m_termHostWidget = p->widget(); m_layout->addWidget( m_termHostWidget ); - cDebug() << "Part widget ought to be" << m_termHostWidget->metaObject()->className(); t->showShellInDir( QDir::home().path() ); t->sendInput( QString( "%1\n" ).arg( m_command ) ); From 13700b18c8ecf5f7ee44e266ef5b45e0eb750243 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 8 Dec 2021 00:06:17 +0100 Subject: [PATCH 52/99] [partition] Warnings-- - remove superfluous `break` - massage types around partition sizes --- src/modules/partition/PartitionViewStep.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/modules/partition/PartitionViewStep.cpp b/src/modules/partition/PartitionViewStep.cpp index a6b5e1dd8..18f10d629 100644 --- a/src/modules/partition/PartitionViewStep.cpp +++ b/src/modules/partition/PartitionViewStep.cpp @@ -146,15 +146,12 @@ modeDescription( Config::InstallChoice choice ) case Config::InstallChoice::Alongside: return QCoreApplication::translate( context, "Install %1 alongside another operating system." ) .arg( branding->shortVersionedName() ); - break; case Config::InstallChoice::Erase: return QCoreApplication::translate( context, "Erase disk and install %1." ) .arg( branding->shortVersionedName() ); - break; case Config::InstallChoice::Replace: return QCoreApplication::translate( context, "Replace a partition with %1." ) .arg( branding->shortVersionedName() ); - break; case Config::InstallChoice::NoChoice: case Config::InstallChoice::Manual: return QCoreApplication::translate( context, "Manual partitioning." ); @@ -187,21 +184,18 @@ diskDescription( int listLength, const PartitionCoreModule::SummaryInfo& info, C .arg( branding->shortVersionedName() ) .arg( info.deviceNode ) .arg( info.deviceName ); - break; case Config::Erase: return QCoreApplication::translate( context, "Erase disk %2 (%3) and install %1." ) .arg( branding->shortVersionedName() ) .arg( info.deviceNode ) .arg( info.deviceName ); - break; case Config::Replace: return QCoreApplication::translate( context, "Replace a partition on disk %2 (%3) with %1." ) .arg( branding->shortVersionedName() ) .arg( info.deviceNode ) .arg( info.deviceName ); - break; case Config::NoChoice: case Config::Manual: return QCoreApplication::translate( @@ -558,7 +552,7 @@ PartitionViewStep::onLeave() if ( !okSize ) { cDebug() << o << "ESP too small"; - const auto atLeastBytes = PartUtils::efiFilesystemMinimumSize(); + const qint64 atLeastBytes = static_cast< qint64 >( PartUtils::efiFilesystemMinimumSize() ); const auto atLeastMiB = CalamaresUtils::BytesToMiB( atLeastBytes ); description.append( ' ' ); description.append( tr( "The filesystem must be at least %1 MiB in size." ).arg( atLeastMiB ) ); From e8ca298712461c694269300422964905ed944af1 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 8 Dec 2021 00:15:01 +0100 Subject: [PATCH 53/99] [partition] Reduce warnings --- src/modules/partition/core/PartUtils.cpp | 8 ++++++-- src/modules/partition/core/PartitionActions.cpp | 6 +++--- src/modules/partition/core/PartitionLayout.cpp | 3 +++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp index 507330a80..cb7c8a01d 100644 --- a/src/modules/partition/core/PartUtils.cpp +++ b/src/modules/partition/core/PartUtils.cpp @@ -451,6 +451,8 @@ isEfiFilesystemSuitableType( const Partition* candidate ) { auto type = candidate->fileSystem().type(); + QT_WARNING_PUSH + QT_WARNING_DISABLE_CLANG( "-Wswitch-enum" ) switch ( type ) { case FileSystem::Type::Fat32: @@ -465,6 +467,7 @@ isEfiFilesystemSuitableType( const Partition* candidate ) cWarning() << "EFI boot partition must be FAT32"; return false; } + QT_WARNING_POP } bool @@ -526,14 +529,15 @@ efiFilesystemMinimumSize() { using CalamaresUtils::Units::operator""_MiB; - auto uefisys_part_sizeB = 300_MiB; + size_t uefisys_part_sizeB = 300_MiB; // The default can be overridden; the key used here comes // from the partition module Config.cpp auto* gs = Calamares::JobQueue::instance()->globalStorage(); if ( gs->contains( "efiSystemPartitionSize_i" ) ) { - uefisys_part_sizeB = gs->value( "efiSystemPartitionSize_i" ).toLongLong(); + qint64 v = gs->value( "efiSystemPartitionSize_i" ).toLongLong(); + uefisys_part_sizeB = v > 0 ? static_cast< size_t >( v ) : 0; } // There is a lower limit of what can be configured if ( uefisys_part_sizeB < 32_MiB ) diff --git a/src/modules/partition/core/PartitionActions.cpp b/src/modules/partition/core/PartitionActions.cpp index 8514bbe2c..8226499b4 100644 --- a/src/modules/partition/core/PartitionActions.cpp +++ b/src/modules/partition/core/PartitionActions.cpp @@ -71,15 +71,15 @@ swapSuggestion( const qint64 availableSpaceB, Config::SwapChoice swap ) // Allow for a fudge factor - suggestedSwapSizeB *= overestimationFactor; + suggestedSwapSizeB = qRound( suggestedSwapSizeB * overestimationFactor ); // don't use more than 10% of available space if ( !ensureSuspendToDisk ) { - suggestedSwapSizeB = qMin( suggestedSwapSizeB, qint64( 0.10 * availableSpaceB ) ); + suggestedSwapSizeB = qMin( suggestedSwapSizeB, availableSpaceB / 10 /* 10% is 0.1 */ ); } - cDebug() << "Suggested swap size:" << suggestedSwapSizeB / 1024. / 1024. / 1024. << "GiB"; + cDebug() << "Suggested swap size:" << CalamaresUtils::BytesToGiB( suggestedSwapSizeB ) << "GiB"; return suggestedSwapSizeB; } diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp index f60952643..3813207ef 100644 --- a/src/modules/partition/core/PartitionLayout.cpp +++ b/src/modules/partition/core/PartitionLayout.cpp @@ -141,6 +141,8 @@ void PartitionLayout::setDefaultFsType( FileSystem::Type defaultFsType ) { using FileSystem = FileSystem::Type; + QT_WARNING_PUSH + QT_WARNING_DISABLE_CLANG( "-Wswitch-enum" ) switch ( defaultFsType ) { case FileSystem::Unknown: @@ -196,6 +198,7 @@ PartitionLayout::setDefaultFsType( FileSystem::Type defaultFsType ) << "Using ext4 instead."; defaultFsType = FileSystem::Ext4; } + QT_WARNING_POP m_defaultFsType = defaultFsType; } From f0eb7ffbda5f6844c864ee0d5269a54445bbab6e Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 8 Dec 2021 00:59:20 +0100 Subject: [PATCH 54/99] [partition Untangle, Warnings-- The translations apply to labels and a tooltip, which depends on the partition-table type. Move the strings together and make the whole range of the switch explicitly. --- .../partition/gui/DeviceInfoWidget.cpp | 83 ++++++++++--------- 1 file changed, 46 insertions(+), 37 deletions(-) diff --git a/src/modules/partition/gui/DeviceInfoWidget.cpp b/src/modules/partition/gui/DeviceInfoWidget.cpp index bbc8ce74c..05a8c4b63 100644 --- a/src/modules/partition/gui/DeviceInfoWidget.cpp +++ b/src/modules/partition/gui/DeviceInfoWidget.cpp @@ -68,7 +68,8 @@ DeviceInfoWidget::setPartitionTableType( PartitionTable::TableType type ) void DeviceInfoWidget::retranslateUi() { - QString typeString = PartitionTable::tableTypeToName( m_tableType ).toUpper(); + QString typeString; + QString toolTipString; // fix up if the name shouldn't be uppercase: switch ( m_tableType ) @@ -76,38 +77,32 @@ DeviceInfoWidget::retranslateUi() case PartitionTable::msdos: case PartitionTable::msdos_sectorbased: typeString = "MBR"; + toolTipString += tr( "

This partition table type is only advisable on older " + "systems which start from a BIOS boot " + "environment. GPT is recommended in most other cases.

" + "Warning: the MBR partition table " + "is an obsolete MS-DOS era standard.
" + "Only 4 primary partitions may be created, and of " + "those 4, one can be an extended partition, which " + "may in turn contain many logical partitions." ); + break; + case PartitionTable::gpt: + // TypeString is ok + toolTipString += tr( "

This is the recommended partition table type for modern " + "systems which start from an EFI boot " + "environment." ); break; case PartitionTable::loop: typeString = "loop"; - break; - case PartitionTable::mac: - typeString = "Mac"; - break; - case PartitionTable::amiga: - typeString = "Amiga"; - break; - case PartitionTable::sun: - typeString = "Sun"; - break; - case PartitionTable::unknownTableType: - typeString = " ? "; - } - - - QString toolTipString = tr( "This device has a %1 partition " - "table." ) - .arg( typeString ); - - switch ( m_tableType ) - { - case PartitionTable::loop: toolTipString = tr( "This is a loop " "device.

" "It is a pseudo-device with no partition table " "that makes a file accessible as a block device. " "This kind of setup usually only contains a single filesystem." ); break; + case PartitionTable::none: case PartitionTable::unknownTableType: + typeString = " ? "; toolTipString = tr( "This installer cannot detect a partition table on the " "selected storage device.

" "The device either has no partition " @@ -117,21 +112,35 @@ DeviceInfoWidget::retranslateUi() "either automatically, or through the manual partitioning " "page." ); break; - case PartitionTable::gpt: - toolTipString += tr( "

This is the recommended partition table type for modern " - "systems which start from an EFI boot " - "environment." ); + // The next ones need to have the name adjusted, but the default tooltip is OK + case PartitionTable::mac: + typeString = "Mac"; break; - case PartitionTable::msdos: - case PartitionTable::msdos_sectorbased: - toolTipString += tr( "

This partition table type is only advisable on older " - "systems which start from a BIOS boot " - "environment. GPT is recommended in most other cases.

" - "Warning: the MBR partition table " - "is an obsolete MS-DOS era standard.
" - "Only 4 primary partitions may be created, and of " - "those 4, one can be an extended partition, which " - "may in turn contain many logical partitions." ); + case PartitionTable::amiga: + typeString = "Amiga"; + break; + case PartitionTable::sun: + typeString = "Sun"; + break; + // Peculiar tables, do nothing and use default type and tooltip strings + case PartitionTable::aix: + case PartitionTable::bsd: + case PartitionTable::dasd: + case PartitionTable::dvh: + case PartitionTable::pc98: + case PartitionTable::vmd: + break; + } + + if ( typeString.isEmpty() ) + { + typeString = PartitionTable::tableTypeToName( m_tableType ).toUpper(); + } + if ( toolTipString.isEmpty() ) + { + toolTipString = tr( "This device has a %1 partition " + "table." ) + .arg( typeString ); } m_ptLabel->setText( typeString ); From 043bdc36d683e6619acc336879d7c102c2a0485b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 8 Dec 2021 01:02:27 +0100 Subject: [PATCH 55/99] Changes: document contributors --- CHANGES-3.2 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES-3.2 b/CHANGES-3.2 index 81fd55343..b658191fb 100644 --- a/CHANGES-3.2 +++ b/CHANGES-3.2 @@ -10,10 +10,13 @@ website will have to do for older versions. # 3.2.49 (unreleased) # This release contains contributions from (alphabetically by first name): + - Artem Grinev - Evan James ## Core ## - - No core changes yet + - Errors (e.g. when an installation fails for whatever reason) are displayed + in a dialog with a scrollable details panel, rather than growing up + to the size of the screen. (Thanks Artem) ## Modules ## - *partition* now supports "deep" btrfs subvolume names, e.g. a From bb948c47dc447c0a01c9d2ecbadeb3aa060bdb77 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 8 Dec 2021 13:06:53 +0100 Subject: [PATCH 56/99] [fstab] Cut the example btrfs flags to 'defaults' Testing shows that the flags can influence -- maybe cause -- data corruption when noatime is set. FIXES #1846 --- src/modules/fstab/fstab.conf | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/modules/fstab/fstab.conf b/src/modules/fstab/fstab.conf index c05f1929a..560aa0073 100644 --- a/src/modules/fstab/fstab.conf +++ b/src/modules/fstab/fstab.conf @@ -18,10 +18,16 @@ # # btrfs_swap options are used when a swapfile is chosen with a btrfs root # the options are applied to the subvolume which holds the swap partition +# +# The settings shown here apply only the btrfs defaults; these +# are generally the right ones. Commented-out lines show other +# options wich **might** be applicable for specific situations. mountOptions: default: defaults,noatime - btrfs: defaults,noatime,autodefrag,compress=zstd - btrfs_swap: defaults,noatime + # btrfs: defaults,noatime,autodefrag,compress=zstd + btrfs: defaults + # btrfs_swap: defaults,noatime + btrfs_swap: defaults # Mount options to use for the EFI System Partition. If not defined, the # *mountOptions* for *vfat* are used, or if that is not set either, From bc2713ccbbb857ece8329b1b0eb0ef68e17e4d50 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 8 Dec 2021 14:08:37 +0100 Subject: [PATCH 57/99] [libcalamares] Add string functions for lstrip() and rstrip()-like --- src/libcalamares/utils/String.cpp | 21 ++++++++++ src/libcalamares/utils/String.h | 13 ++++++ src/libcalamares/utils/Tests.cpp | 68 +++++++++++++++++++++++++++++-- 3 files changed, 99 insertions(+), 3 deletions(-) diff --git a/src/libcalamares/utils/String.cpp b/src/libcalamares/utils/String.cpp index 615d30309..c88c23693 100644 --- a/src/libcalamares/utils/String.cpp +++ b/src/libcalamares/utils/String.cpp @@ -224,5 +224,26 @@ truncateMultiLine( const QString& string, CalamaresUtils::LinesStartEnd lines, C return front + back.right( chars.total / 2 ); } +void +removeLeading( QString& string, QChar c ) +{ + int count = 0; + while ( string.length() > count && string[ count ] == c ) + { + count++; + } + string.remove( 0, count ); +} + +void +removeTrailing( QString& string, QChar c ) +{ + int lastIndex = string.length(); + while ( lastIndex > 0 && string[ lastIndex - 1 ] == c ) + { + lastIndex--; + } + string.remove( lastIndex, string.length() ); +} } // namespace CalamaresUtils diff --git a/src/libcalamares/utils/String.h b/src/libcalamares/utils/String.h index e08255f86..1adc2336a 100644 --- a/src/libcalamares/utils/String.h +++ b/src/libcalamares/utils/String.h @@ -100,6 +100,19 @@ DLLEXPORT QString truncateMultiLine( const QString& string, LinesStartEnd lines = LinesStartEnd { 3, 5 }, CharCount chars = CharCount { 812 } ); +/** @brief Remove all @p c at the beginning of @p string + * + * Modifies the @p string in-place. If @p c is not the first character + * of @p string, the string is left unchanged; otherwise the first character + * is removed and the process repeats. + */ +DLLEXPORT void removeLeading( QString& string, QChar c ); +/** @brief Remove all @p c at the end of @p string + * + * Like removeLeading(), but at the end of the string. + */ +DLLEXPORT void removeTrailing( QString& string, QChar c ); + } // namespace CalamaresUtils #endif diff --git a/src/libcalamares/utils/Tests.cpp b/src/libcalamares/utils/Tests.cpp index 8fd11cd87..3dde75338 100644 --- a/src/libcalamares/utils/Tests.cpp +++ b/src/libcalamares/utils/Tests.cpp @@ -70,6 +70,10 @@ private Q_SLOTS: void testStringTruncation(); void testStringTruncationShorter(); void testStringTruncationDegenerate(); + void testStringRemoveLeading_data(); + void testStringRemoveLeading(); + void testStringRemoveTrailing_data(); + void testStringRemoveTrailing(); /** @section Test Runner directory-manipulation. */ void testRunnerDirs(); @@ -754,6 +758,64 @@ LibCalamaresTests::testStringTruncationDegenerate() } } +void +LibCalamaresTests::testStringRemoveLeading_data() +{ + QTest::addColumn< QString >( "string" ); + QTest::addColumn< char >( "c" ); + QTest::addColumn< QString >( "result" ); + + QTest::newRow( "empty" ) << QString() << '/' << QString(); + QTest::newRow( "one-slash" ) << QStringLiteral( "/tmp" ) << '/' << QStringLiteral( "tmp" ); + QTest::newRow( "two-slash" ) << QStringLiteral( "//tmp" ) << '/' << QStringLiteral( "tmp" ); + QTest::newRow( "multi-slash" ) << QStringLiteral( "/tmp/p" ) << '/' << QStringLiteral( "tmp/p" ); + QTest::newRow( "later-slash" ) << QStringLiteral( "@/tmp" ) << '/' << QStringLiteral( "@/tmp" ); + QTest::newRow( "all-one-slash" ) << QStringLiteral( "/" ) << '/' << QString(); + QTest::newRow( "all-many-slash" ) << QStringLiteral( "////////////////////" ) << '/' << QString(); + QTest::newRow( "trailing" ) << QStringLiteral( "tmp/" ) << '/' << QStringLiteral( "tmp/" ); +} + +void +LibCalamaresTests::testStringRemoveLeading() +{ + QFETCH( QString, string ); + QFETCH( char, c ); + QFETCH( QString, result ); + + const QString initial = string; + CalamaresUtils::removeLeading( string, c ); + QCOMPARE( string, result ); +} + +void +LibCalamaresTests::testStringRemoveTrailing_data() +{ + QTest::addColumn< QString >( "string" ); + QTest::addColumn< char >( "c" ); + QTest::addColumn< QString >( "result" ); + + QTest::newRow( "empty" ) << QString() << '/' << QString(); + QTest::newRow( "one-slash" ) << QStringLiteral( "/tmp" ) << '/' << QStringLiteral( "/tmp" ); + QTest::newRow( "two-slash" ) << QStringLiteral( "//tmp" ) << '/' << QStringLiteral( "//tmp" ); + QTest::newRow( "multi-slash" ) << QStringLiteral( "/tmp//p/" ) << '/' << QStringLiteral( "/tmp//p" ); + QTest::newRow( "later-slash" ) << QStringLiteral( "@/tmp/@" ) << '/' << QStringLiteral( "@/tmp/@" ); + QTest::newRow( "later-slash2" ) << QStringLiteral( "@/tmp/@//" ) << '/' << QStringLiteral( "@/tmp/@" ); + QTest::newRow( "all-one-slash" ) << QStringLiteral( "/" ) << '/' << QString(); + QTest::newRow( "all-many-slash" ) << QStringLiteral( "////////////////////" ) << '/' << QString(); + QTest::newRow( "trailing" ) << QStringLiteral( "tmp/" ) << '/' << QStringLiteral( "tmp" ); +} + +void +LibCalamaresTests::testStringRemoveTrailing() +{ + QFETCH( QString, string ); + QFETCH( char, c ); + QFETCH( QString, result ); + + const QString initial = string; + CalamaresUtils::removeTrailing( string, c ); + QCOMPARE( string, result ); +} static QString dirname( const QTemporaryDir& d ) @@ -1001,10 +1063,10 @@ LibCalamaresTests::testReadWriteFile() { auto fullPath = ss->createTargetFile( "test0", otherContents ); QVERIFY( !fullPath ); // Failed, because it won't overwrite - QCOMPARE( fullPath.code(), decltype(fullPath)::Code::AlreadyExists ); - QVERIFY( fullPath.path().isEmpty() ); // Because it wasn't written + QCOMPARE( fullPath.code(), decltype( fullPath )::Code::AlreadyExists ); + QVERIFY( fullPath.path().isEmpty() ); // Because it wasn't written - QFileInfo fi( tempRoot.filePath( "test0" ) ); // Compute the name some other way + QFileInfo fi( tempRoot.filePath( "test0" ) ); // Compute the name some other way QVERIFY( fi.exists() ); QVERIFY( fi.isFile() ); QCOMPARE( fi.size(), 0 ); From 5ca029df255cdc01ccbe599480e3f89ebd89e060 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 30 Nov 2021 16:02:59 +0100 Subject: [PATCH 58/99] [luksopenswaphookcfg] Start a C++ port - this module needs work to handle BTRFS special-cases *anyway* - limited in scope, few options: port it while doing the special-cases So far, this is just a C++ stub. SEE #1659 #1644 --- .../luksopenswaphookcfg/CMakeLists.txt | 21 +++++++ src/modules/luksopenswaphookcfg/LOSHJob.cpp | 62 +++++++++++++++++++ src/modules/luksopenswaphookcfg/Tests.cpp | 38 ++++++++++++ src/modules/luksopenswaphookcfg/module.desc | 7 --- 4 files changed, 121 insertions(+), 7 deletions(-) create mode 100644 src/modules/luksopenswaphookcfg/CMakeLists.txt create mode 100644 src/modules/luksopenswaphookcfg/LOSHJob.cpp create mode 100644 src/modules/luksopenswaphookcfg/Tests.cpp delete mode 100644 src/modules/luksopenswaphookcfg/module.desc diff --git a/src/modules/luksopenswaphookcfg/CMakeLists.txt b/src/modules/luksopenswaphookcfg/CMakeLists.txt new file mode 100644 index 000000000..64b6c58bc --- /dev/null +++ b/src/modules/luksopenswaphookcfg/CMakeLists.txt @@ -0,0 +1,21 @@ +# === This file is part of Calamares - === +# +# SPDX-FileCopyrightText: 2021 Adriaan de Groot +# SPDX-License-Identifier: BSD-2-Clause +# + +# Because LUKS Open Swap Hook (Job) is such a mouthful, we'll +# use LOSH all over the place as a shorthand. +calamares_add_plugin( luksopenswaphook + TYPE job + EXPORT_MACRO PLUGINDLLEXPORT_PRO + SOURCES + LOSHJob.cpp + SHARED_LIB +) + +calamares_add_test( + luksopenswaphooktest + SOURCES + Tests.cpp +) diff --git a/src/modules/luksopenswaphookcfg/LOSHJob.cpp b/src/modules/luksopenswaphookcfg/LOSHJob.cpp new file mode 100644 index 000000000..e05b24108 --- /dev/null +++ b/src/modules/luksopenswaphookcfg/LOSHJob.cpp @@ -0,0 +1,62 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2021 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +#include "CppJob.h" +#include "DllMacro.h" +#include "utils/Permissions.h" +#include "utils/PluginFactory.h" + +#include +#include +#include + +class PLUGINDLLEXPORT LOSHJob : public Calamares::CppJob +{ + Q_OBJECT + +public: + explicit LOSHJob( QObject* parent = nullptr ); + ~LOSHJob() override; + + QString prettyName() const override; + + Calamares::JobResult exec() override; + + void setConfigurationMap( const QVariantMap& configurationMap ) override; + +private: +}; + +LOSHJob::LOSHJob( QObject* parent ) + : Calamares::CppJob( parent ) +{ +} + +QString +LOSHJob::prettyName() const +{ + return tr( "Configuring encrypted swap." ); +} + + +Calamares::JobResult +LOSHJob::exec() +{ + return Calamares::JobResult::ok(); +} + +void +LOSHJob::setConfigurationMap( const QVariantMap& configurationMap ) +{ +} + +CALAMARES_PLUGIN_FACTORY_DECLARATION( LOSHJobFactory ) +CALAMARES_PLUGIN_FACTORY_DEFINITION( LOSHJobFactory, registerPlugin< LOSHJob >(); ) + +#include "utils/moc-warnings.h" + +#include "LOSHJob.moc" diff --git a/src/modules/luksopenswaphookcfg/Tests.cpp b/src/modules/luksopenswaphookcfg/Tests.cpp new file mode 100644 index 000000000..233701746 --- /dev/null +++ b/src/modules/luksopenswaphookcfg/Tests.cpp @@ -0,0 +1,38 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2021 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +#include "utils/Logger.h" + +#include + +// LOSH = LUKS Open Swap Hook (Job) + +class LOSHTests : public QObject +{ + Q_OBJECT +public: + LOSHTests(); + ~LOSHTests() override {} + +private Q_SLOTS: + void initTestCase(); + + void testTrue(); +}; + +LOSHTests::LOSHTests() {} + +void +LOSHTests::initTestCase() +{ + Logger::setupLogLevel( Logger::LOGDEBUG ); + cDebug() << "LOSH test started."; +} + +#include "utils/moc-warnings.h" + +#include "Tests.moc" diff --git a/src/modules/luksopenswaphookcfg/module.desc b/src/modules/luksopenswaphookcfg/module.desc deleted file mode 100644 index 919a92792..000000000 --- a/src/modules/luksopenswaphookcfg/module.desc +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-FileCopyrightText: no -# SPDX-License-Identifier: CC0-1.0 ---- -type: "job" -name: "luksopenswaphookcfg" -interface: "python" -script: "main.py" From 7ea21663cacf8f8e40a184db304d3dddbf9ce04e Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 3 Dec 2021 13:28:16 +0100 Subject: [PATCH 59/99] [luksopenswaphookcfg] Partial implementation in C++ - Futz a bit with the string replacements -- do not assume # will introduce a comment half-way through a line. --- .../luksopenswaphookcfg/CMakeLists.txt | 1 + src/modules/luksopenswaphookcfg/LOSHInfo.h | 62 ++++++ src/modules/luksopenswaphookcfg/LOSHJob.cpp | 106 ++++++++--- src/modules/luksopenswaphookcfg/LOSHJob.h | 37 ++++ src/modules/luksopenswaphookcfg/Tests.cpp | 180 +++++++++++++++++- 5 files changed, 361 insertions(+), 25 deletions(-) create mode 100644 src/modules/luksopenswaphookcfg/LOSHInfo.h create mode 100644 src/modules/luksopenswaphookcfg/LOSHJob.h diff --git a/src/modules/luksopenswaphookcfg/CMakeLists.txt b/src/modules/luksopenswaphookcfg/CMakeLists.txt index 64b6c58bc..6d80df815 100644 --- a/src/modules/luksopenswaphookcfg/CMakeLists.txt +++ b/src/modules/luksopenswaphookcfg/CMakeLists.txt @@ -17,5 +17,6 @@ calamares_add_plugin( luksopenswaphook calamares_add_test( luksopenswaphooktest SOURCES + LOSHJob.cpp Tests.cpp ) diff --git a/src/modules/luksopenswaphookcfg/LOSHInfo.h b/src/modules/luksopenswaphookcfg/LOSHInfo.h new file mode 100644 index 000000000..94ccba379 --- /dev/null +++ b/src/modules/luksopenswaphookcfg/LOSHInfo.h @@ -0,0 +1,62 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2021 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#ifndef LUKSOPENSWAPHOOKCFG_LOSHINFO_H +#define LUKSOPENSWAPHOOKCFG_LOSHINFO_H + +#include + +/** @brief Information needed to create a suitable config file + * + * The LUKS swap configuration has a handful of keys that need to + * be written to the config file. This struct holds those keys + * and can find the key values from Global Storage (where the + * *partition* module sets them). + */ +struct LOSHInfo +{ + // Member names copied from Python code + QString swap_outer_uuid; + QString swap_mapper_name; + QString mountable_keyfile_device; + QString swap_device_path; + + bool isValid() const { return !swap_device_path.isEmpty(); } + + /** @brief Helper method for doing key-value replacements + * + * Given a named @p key (e.g. "duck", or "swap_device"), returns the + * value set for that key. Invalid keys (e.g. "duck") return an empty string. + */ + QString replacementFor( const QString& key ) const + { + if ( key == QStringLiteral( "swap_device" ) ) + { + return swap_device_path; + } + if ( key == QStringLiteral( "crypt_swap_name" ) ) + { + return swap_mapper_name; + } + if ( key == QStringLiteral( "keyfile_device" ) ) + { + return mountable_keyfile_device; + } + if ( key == QStringLiteral( "keyfile_filename" ) ) + { + return QStringLiteral( "crypto_keyfile.bin" ); + } + return QString(); + } + + /** @brief Creates a struct from information already set in GS + * + * TODO: implement this in LOSHJob.cpp + */ + static LOSHInfo fromGlobalStorage() { return LOSHInfo {}; } +}; + +#endif diff --git a/src/modules/luksopenswaphookcfg/LOSHJob.cpp b/src/modules/luksopenswaphookcfg/LOSHJob.cpp index e05b24108..986213cf5 100644 --- a/src/modules/luksopenswaphookcfg/LOSHJob.cpp +++ b/src/modules/luksopenswaphookcfg/LOSHJob.cpp @@ -4,59 +4,117 @@ * SPDX-License-Identifier: GPL-3.0-or-later * */ +#include "LOSHJob.h" -#include "CppJob.h" -#include "DllMacro.h" +#include "LOSHInfo.h" + +#include "GlobalStorage.h" +#include "JobQueue.h" +#include "utils/CalamaresUtilsSystem.h" +#include "utils/Logger.h" #include "utils/Permissions.h" #include "utils/PluginFactory.h" +#include "utils/Variant.h" #include #include #include -class PLUGINDLLEXPORT LOSHJob : public Calamares::CppJob -{ - Q_OBJECT - -public: - explicit LOSHJob( QObject* parent = nullptr ); - ~LOSHJob() override; - - QString prettyName() const override; - - Calamares::JobResult exec() override; - - void setConfigurationMap( const QVariantMap& configurationMap ) override; - -private: -}; - LOSHJob::LOSHJob( QObject* parent ) : Calamares::CppJob( parent ) { } +LOSHJob::~LOSHJob() {} + + QString LOSHJob::prettyName() const { return tr( "Configuring encrypted swap." ); } +STATICTEST QString +get_assignment_part( const QString& line ) +{ + static QRegularExpression re( "^[# \\t]*([A-Za-z_]+)[ \\t]*=" ); + auto m = re.match( line ); + if ( m.hasMatch() ) + { + return m.captured( 1 ); + } + return QString(); +} + +/** Writes the config file at @p path + * + * NOTE: @p path is relative to the target system, not an absolute path. + */ +STATICTEST void +write_openswap_conf( const QString& path, QStringList& contents, const LOSHInfo& info ) +{ + if ( info.isValid() ) + { + for ( auto& line : contents ) + { + const QString key = get_assignment_part( line ); + QString replacement = info.replacementFor( key ); + if ( !replacement.isEmpty() ) + { + line.clear(); + line.append( QStringLiteral( "%1=%2" ).arg( key, replacement ) ); + } + } + cDebug() << "Writing" << contents.length() << "line configuration to" << path; + // \n between each two lines, and a \n at the end + CalamaresUtils::System::instance()->createTargetFile( + path, contents.join( '\n' ).append( '\n' ).toUtf8(), CalamaresUtils::System::WriteMode::Overwrite ); + } + else + { + cDebug() << "Will not write an invalid configuration to" << path; + } +} Calamares::JobResult LOSHJob::exec() { + const auto* sys = CalamaresUtils::System::instance(); + if ( !sys ) + { + return Calamares::JobResult::internalError( + "LuksOpenSwapHook", tr( "No target system available." ), Calamares::JobResult::InvalidConfiguration ); + } + + Calamares::GlobalStorage* gs + = Calamares::JobQueue::instance() ? Calamares::JobQueue::instance()->globalStorage() : nullptr; + if ( !gs || gs->value( "rootMountPoint" ).toString().isEmpty() ) + { + return Calamares::JobResult::internalError( + "LuksOpenSwapHook", tr( "No rootMountPoint is set." ), Calamares::JobResult::InvalidConfiguration ); + } + if ( m_configFilePath.isEmpty() ) + { + return Calamares::JobResult::internalError( + "LuksOpenSwapHook", tr( "No configFilePath is set." ), Calamares::JobResult::InvalidConfiguration ); + } + + QStringList contents = sys->readTargetFile( m_configFilePath ); + if ( contents.isEmpty() ) + { + contents << QStringLiteral( "# swap_device=" ) << QStringLiteral( "# crypt_swap_name=" ) + << QStringLiteral( "# keyfile_device=" ) << QStringLiteral( "# keyfile_filename=" ); + } + + write_openswap_conf( m_configFilePath, contents, LOSHInfo::fromGlobalStorage() ); return Calamares::JobResult::ok(); } void LOSHJob::setConfigurationMap( const QVariantMap& configurationMap ) { + m_configFilePath = CalamaresUtils::getString( + configurationMap, QStringLiteral( "configFilePath" ), QStringLiteral( "/etc/openswap.conf" ) ); } -CALAMARES_PLUGIN_FACTORY_DECLARATION( LOSHJobFactory ) CALAMARES_PLUGIN_FACTORY_DEFINITION( LOSHJobFactory, registerPlugin< LOSHJob >(); ) - -#include "utils/moc-warnings.h" - -#include "LOSHJob.moc" diff --git a/src/modules/luksopenswaphookcfg/LOSHJob.h b/src/modules/luksopenswaphookcfg/LOSHJob.h new file mode 100644 index 000000000..4a435a935 --- /dev/null +++ b/src/modules/luksopenswaphookcfg/LOSHJob.h @@ -0,0 +1,37 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2021 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#ifndef LUKSOPENSWAPHOOKCFG_LOSHJOB_H +#define LUKSOPENSWAPHOOKCFG_LOSHJOB_H + +#include "CppJob.h" +#include "DllMacro.h" +#include "utils/PluginFactory.h" + +#include +#include + +class PLUGINDLLEXPORT LOSHJob : public Calamares::CppJob +{ + Q_OBJECT + +public: + explicit LOSHJob( QObject* parent = nullptr ); + ~LOSHJob() override; + + QString prettyName() const override; + + Calamares::JobResult exec() override; + + void setConfigurationMap( const QVariantMap& configurationMap ) override; + +private: + QString m_configFilePath; +}; + +CALAMARES_PLUGIN_FACTORY_DECLARATION( LOSHJobFactory ) + +#endif diff --git a/src/modules/luksopenswaphookcfg/Tests.cpp b/src/modules/luksopenswaphookcfg/Tests.cpp index 233701746..0cb79d7b9 100644 --- a/src/modules/luksopenswaphookcfg/Tests.cpp +++ b/src/modules/luksopenswaphookcfg/Tests.cpp @@ -5,12 +5,22 @@ * */ +#include "LOSHInfo.h" +#include "LOSHJob.h" + +#include "GlobalStorage.h" +#include "JobQueue.h" +#include "utils/CalamaresUtilsSystem.h" #include "utils/Logger.h" #include // LOSH = LUKS Open Swap Hook (Job) +// Implementation details +extern QString get_assignment_part( const QString& line ); +extern void write_openswap_conf( const QString& path, QStringList& contents, const LOSHInfo& info ); + class LOSHTests : public QObject { Q_OBJECT @@ -21,7 +31,12 @@ public: private Q_SLOTS: void initTestCase(); - void testTrue(); + void testAssignmentExtraction_data(); + void testAssignmentExtraction(); + + void testLOSHInfo(); + void testConfigWriting(); + void testJob(); }; LOSHTests::LOSHTests() {} @@ -33,6 +48,169 @@ LOSHTests::initTestCase() cDebug() << "LOSH test started."; } + +void +LOSHTests::testAssignmentExtraction_data() +{ + QTest::addColumn< QString >( "line" ); + QTest::addColumn< QString >( "match" ); + + QTest::newRow( "empty" ) << QString() << QString(); + QTest::newRow( "comment-only1" ) << QStringLiteral( "# " ) << QString(); + QTest::newRow( "comment-only2" ) << QStringLiteral( "###" ) << QString(); + QTest::newRow( "comment-only3" ) << QStringLiteral( "# # #" ) << QString(); + + QTest::newRow( "comment-text" ) << QStringLiteral( "# NOTE:" ) << QString(); + QTest::newRow( "comment-story" ) << QStringLiteral( "# This is a shell comment" ) << QString(); + // We look for assignments, but only for single-words + QTest::newRow( "comment-space-eq" ) << QStringLiteral( "# Check that a = b" ) << QString(); + + + QTest::newRow( "assignment1" ) << QStringLiteral( "a=1" ) << QStringLiteral( "a" ); + QTest::newRow( "assignment2" ) << QStringLiteral( "a = 1" ) << QStringLiteral( "a" ); + QTest::newRow( "assignment3" ) << QStringLiteral( "# a=1" ) << QStringLiteral( "a" ); + QTest::newRow( "assignment4" ) << QStringLiteral( "cows = 12" ) << QStringLiteral( "cows" ); + QTest::newRow( "assignment5" ) << QStringLiteral( "# # cows=1" ) << QStringLiteral( "cows" ); + QTest::newRow( "assignment6" ) << QStringLiteral( "# moose='cool' # not cows" ) << QStringLiteral( "moose" ); + QTest::newRow( "assignment7" ) << QStringLiteral( " moose=cows=42" ) << QStringLiteral( "moose" ); +} + +void +LOSHTests::testAssignmentExtraction() +{ + QFETCH( QString, line ); + QFETCH( QString, match ); + + QCOMPARE( get_assignment_part( line ), match ); +} + +static CalamaresUtils::System* +file_setup( const QTemporaryDir& tempRoot ) +{ + CalamaresUtils::System* ss = CalamaresUtils::System::instance(); + if ( !ss ) + { + ss = new CalamaresUtils::System( true ); + } + + Calamares::GlobalStorage* gs + = Calamares::JobQueue::instance() ? Calamares::JobQueue::instance()->globalStorage() : nullptr; + if ( !gs ) + { + cDebug() << "Creating new JobQueue"; + (void)new Calamares::JobQueue(); + gs = Calamares::JobQueue::instance() ? Calamares::JobQueue::instance()->globalStorage() : nullptr; + } + if ( gs ) + { + // Working with a rootMountPoint set + gs->insert( "rootMountPoint", tempRoot.path() ); + } + return ss; +} + +static void +make_valid_loshinfo( LOSHInfo& i ) +{ + i.swap_outer_uuid = QStringLiteral( "UUID-0000" ); + i.swap_mapper_name = QStringLiteral( "/dev/mapper/0000" ); + i.swap_device_path = QStringLiteral( "/dev/sda0" ); + i.mountable_keyfile_device = QStringLiteral( "/dev/ada0p0s0" ); +} + +void +LOSHTests::testLOSHInfo() +{ + LOSHInfo i {}; + QVERIFY( !i.isValid() ); + + make_valid_loshinfo( i ); + QVERIFY( i.isValid() ); + QCOMPARE( i.replacementFor( QStringLiteral( "swap_device" ) ), QStringLiteral( "/dev/sda0" ) ); + QCOMPARE( i.replacementFor( QStringLiteral( "duck" ) ), QString() ); +} + + +void +LOSHTests::testConfigWriting() +{ + QTemporaryDir tempRoot( QDir::tempPath() + QStringLiteral( "/test-job-XXXXXX" ) ); + QVERIFY( tempRoot.isValid() ); + auto* ss = file_setup( tempRoot ); + QVERIFY( ss ); + QVERIFY( Calamares::JobQueue::instance()->globalStorage() ); + QVERIFY( QFile::exists( tempRoot.path() ) ); + QVERIFY( QFileInfo(tempRoot.path()).isDir() ); + + const QString targetFilePath = QStringLiteral( "losh.conf" ); + const QString filePath = tempRoot.filePath( targetFilePath ); + QStringList contents { QStringLiteral( "# Calamares demo" ), + QStringLiteral( "# swap_device=a thing" ), + QStringLiteral( "# duck duck swap_device=another" ) }; + + // When the information is invalid, file contents are unchanged, + // and no file is written either. + LOSHInfo i {}; + QVERIFY( !i.isValid() ); + QVERIFY( !QFile::exists( filePath ) ); + write_openswap_conf( targetFilePath, contents, i ); // Invalid i + QVERIFY( !QFile::exists( filePath ) ); + QCOMPARE( contents.length(), 3 ); + QCOMPARE( contents.at( 1 ).left( 4 ), QStringLiteral( "# s" ) ); + + // Can we write there at all? + QFile derp(filePath); + QVERIFY(derp.open(QIODevice::WriteOnly)); + QVERIFY(derp.write("xx", 2)); + derp.close(); + QVERIFY(QFile::exists(filePath)); + QVERIFY(QFile::remove(filePath)); + + // Once the information is valid, though, the file is written + make_valid_loshinfo( i ); + QVERIFY( i.isValid() ); + QVERIFY( !QFile::exists( filePath ) ); + write_openswap_conf( targetFilePath, contents, i ); // Now it is valid + QVERIFY( QFile::exists( filePath ) ); + QCOMPARE( contents.length(), 3 ); + QCOMPARE( i.swap_device_path, QStringLiteral( "/dev/sda0" ) ); // expected key value + QCOMPARE( contents.at( 1 ), QStringLiteral( "swap_device=/dev/sda0" ) ); // expected line + + // readLine() returns with newlines-added + QFile f( filePath ); + QVERIFY( f.open( QIODevice::ReadOnly ) ); + QCOMPARE( f.readLine(), QStringLiteral( "# Calamares demo\n" ) ); + QCOMPARE( f.readLine(), QStringLiteral( "swap_device=/dev/sda0\n" ) ); + QCOMPARE( f.readLine(), QStringLiteral( "# duck duck swap_device=another\n" ) ); + QCOMPARE( f.readLine(), QString() ); + QVERIFY( f.atEnd() ); + + // Note how the contents is updated on every write_openswap_conf() + i.swap_device_path = QStringLiteral( "/dev/zram/0.zram" ); + write_openswap_conf( targetFilePath, contents, i ); // Still valid + QCOMPARE( contents.length(), 3 ); + QCOMPARE( i.swap_device_path, QStringLiteral( "/dev/zram/0.zram" ) ); // expected key value + QCOMPARE( contents.at( 1 ), QStringLiteral( "swap_device=/dev/zram/0.zram" ) ); // expected line +} + + +void LOSHTests::testJob() +{ + QTemporaryDir tempRoot( QDir::tempPath() + QStringLiteral( "/test-job-XXXXXX" ) ); + QVERIFY( tempRoot.isValid() ); + auto* ss = file_setup( tempRoot ); + QVERIFY( ss ); + + LOSHJob j; + j.setConfigurationMap(QVariantMap()); + auto jobresult = j.exec(); + QVERIFY(jobresult); + QVERIFY( QFile::exists( tempRoot.filePath( "etc/openswap.conf" ) ) ); +} + + +QTEST_GUILESS_MAIN( LOSHTests ) + #include "utils/moc-warnings.h" #include "Tests.moc" From 45d6eb36fb4396af7360acef427cfad6ff6f8c23 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 6 Dec 2021 11:21:27 +0100 Subject: [PATCH 60/99] [luksopenswaphookcfg] Extend info with btrfs subvol This is a C++-ification of e8936392 from dalto8 . Add a line for options to the empty-file-fallback. --- src/modules/luksopenswaphookcfg/LOSHInfo.h | 5 +++++ src/modules/luksopenswaphookcfg/LOSHJob.cpp | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/modules/luksopenswaphookcfg/LOSHInfo.h b/src/modules/luksopenswaphookcfg/LOSHInfo.h index 94ccba379..470b5a0cc 100644 --- a/src/modules/luksopenswaphookcfg/LOSHInfo.h +++ b/src/modules/luksopenswaphookcfg/LOSHInfo.h @@ -23,6 +23,7 @@ struct LOSHInfo QString swap_mapper_name; QString mountable_keyfile_device; QString swap_device_path; + QString keyfile_device_mount_options; bool isValid() const { return !swap_device_path.isEmpty(); } @@ -49,6 +50,10 @@ struct LOSHInfo { return QStringLiteral( "crypto_keyfile.bin" ); } + if ( key == QStringLiteral( "keyfile_device_mount_options" ) ) + { + return keyfile_device_mount_options; + } return QString(); } diff --git a/src/modules/luksopenswaphookcfg/LOSHJob.cpp b/src/modules/luksopenswaphookcfg/LOSHJob.cpp index 986213cf5..a5e5a183a 100644 --- a/src/modules/luksopenswaphookcfg/LOSHJob.cpp +++ b/src/modules/luksopenswaphookcfg/LOSHJob.cpp @@ -103,7 +103,8 @@ LOSHJob::exec() if ( contents.isEmpty() ) { contents << QStringLiteral( "# swap_device=" ) << QStringLiteral( "# crypt_swap_name=" ) - << QStringLiteral( "# keyfile_device=" ) << QStringLiteral( "# keyfile_filename=" ); + << QStringLiteral( "# keyfile_device=" ) << QStringLiteral( "# keyfile_filename=" ) + << QStringLiteral( "# keyfile_device_mount_options" ); } write_openswap_conf( m_configFilePath, contents, LOSHInfo::fromGlobalStorage() ); From 2c20a00cc366a6e4a3c9ca953bbec8ec12ed988d Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 6 Dec 2021 19:49:48 +0100 Subject: [PATCH 61/99] [luksopenswaphookcfg] Read GS for finding LUKS config --- src/modules/luksopenswaphookcfg/LOSHInfo.h | 3 +- src/modules/luksopenswaphookcfg/LOSHJob.cpp | 59 +++++++++++++++++++++ src/modules/luksopenswaphookcfg/Tests.cpp | 51 ++++++++++++++---- 3 files changed, 101 insertions(+), 12 deletions(-) diff --git a/src/modules/luksopenswaphookcfg/LOSHInfo.h b/src/modules/luksopenswaphookcfg/LOSHInfo.h index 470b5a0cc..1a87f4e61 100644 --- a/src/modules/luksopenswaphookcfg/LOSHInfo.h +++ b/src/modules/luksopenswaphookcfg/LOSHInfo.h @@ -59,9 +59,8 @@ struct LOSHInfo /** @brief Creates a struct from information already set in GS * - * TODO: implement this in LOSHJob.cpp */ - static LOSHInfo fromGlobalStorage() { return LOSHInfo {}; } + static LOSHInfo fromGlobalStorage(); }; #endif diff --git a/src/modules/luksopenswaphookcfg/LOSHJob.cpp b/src/modules/luksopenswaphookcfg/LOSHJob.cpp index a5e5a183a..916ffcb8b 100644 --- a/src/modules/luksopenswaphookcfg/LOSHJob.cpp +++ b/src/modules/luksopenswaphookcfg/LOSHJob.cpp @@ -14,6 +14,7 @@ #include "utils/Logger.h" #include "utils/Permissions.h" #include "utils/PluginFactory.h" +#include "utils/String.h" #include "utils/Variant.h" #include @@ -118,4 +119,62 @@ LOSHJob::setConfigurationMap( const QVariantMap& configurationMap ) configurationMap, QStringLiteral( "configFilePath" ), QStringLiteral( "/etc/openswap.conf" ) ); } +STATICTEST void +globalStoragePartitionInfo( Calamares::GlobalStorage* gs, LOSHInfo& info ) +{ + if ( !gs ) + { + return; + } + QVariantList l = gs->value( "partitions" ).toList(); + if ( l.isEmpty() ) + { + return; + } + + for ( const auto& pv : l ) + { + const QVariantMap partition = pv.toMap(); + if ( !partition.isEmpty() ) + { + QString mountPoint = partition.value( "mountPoint" ).toString(); + QString fileSystem = partition.value( "fs" ).toString(); + QString luksMapperName = partition.value( "luksMapperName" ).toString(); + // if partition["fs"] == "linuxswap" and "luksMapperName" in partition: + if ( fileSystem == QStringLiteral( "linuxswap" ) && !luksMapperName.isEmpty() ) + { + info.swap_outer_uuid = partition.value( "luksUuid" ).toString(); + info.swap_mapper_name = luksMapperName; + } + else if ( mountPoint == QStringLiteral( "/" ) && !luksMapperName.isEmpty() ) + { + + info.mountable_keyfile_device = QStringLiteral( "/dev/mapper/" ) + luksMapperName; + } + } + } + + if ( !info.mountable_keyfile_device.isEmpty() && !info.swap_outer_uuid.isEmpty() ) + { + info.swap_device_path = QStringLiteral( "/dev/disk/by-uuid/" ) + info.swap_outer_uuid; + } + + QString btrfsRootSubvolume = gs->value( "btrfsRootSubvolume" ).toString(); + if ( !btrfsRootSubvolume.isEmpty() ) + { + CalamaresUtils::removeLeading( btrfsRootSubvolume, '/' ); + info.keyfile_device_mount_options + = QStringLiteral( "keyfile_device_mount_options=--options=subvol=" ) + btrfsRootSubvolume; + } +} + +LOSHInfo +LOSHInfo::fromGlobalStorage() +{ + LOSHInfo i {}; + globalStoragePartitionInfo( + Calamares::JobQueue::instance() ? Calamares::JobQueue::instance()->globalStorage() : nullptr, i ); + return i; +} + CALAMARES_PLUGIN_FACTORY_DEFINITION( LOSHJobFactory, registerPlugin< LOSHJob >(); ) diff --git a/src/modules/luksopenswaphookcfg/Tests.cpp b/src/modules/luksopenswaphookcfg/Tests.cpp index 0cb79d7b9..7ec623eaa 100644 --- a/src/modules/luksopenswaphookcfg/Tests.cpp +++ b/src/modules/luksopenswaphookcfg/Tests.cpp @@ -140,7 +140,7 @@ LOSHTests::testConfigWriting() QVERIFY( ss ); QVERIFY( Calamares::JobQueue::instance()->globalStorage() ); QVERIFY( QFile::exists( tempRoot.path() ) ); - QVERIFY( QFileInfo(tempRoot.path()).isDir() ); + QVERIFY( QFileInfo( tempRoot.path() ).isDir() ); const QString targetFilePath = QStringLiteral( "losh.conf" ); const QString filePath = tempRoot.filePath( targetFilePath ); @@ -159,12 +159,12 @@ LOSHTests::testConfigWriting() QCOMPARE( contents.at( 1 ).left( 4 ), QStringLiteral( "# s" ) ); // Can we write there at all? - QFile derp(filePath); - QVERIFY(derp.open(QIODevice::WriteOnly)); - QVERIFY(derp.write("xx", 2)); + QFile derp( filePath ); + QVERIFY( derp.open( QIODevice::WriteOnly ) ); + QVERIFY( derp.write( "xx", 2 ) ); derp.close(); - QVERIFY(QFile::exists(filePath)); - QVERIFY(QFile::remove(filePath)); + QVERIFY( QFile::exists( filePath ) ); + QVERIFY( QFile::remove( filePath ) ); // Once the information is valid, though, the file is written make_valid_loshinfo( i ); @@ -194,18 +194,49 @@ LOSHTests::testConfigWriting() } -void LOSHTests::testJob() +void +LOSHTests::testJob() { QTemporaryDir tempRoot( QDir::tempPath() + QStringLiteral( "/test-job-XXXXXX" ) ); QVERIFY( tempRoot.isValid() ); auto* ss = file_setup( tempRoot ); QVERIFY( ss ); + Calamares::GlobalStorage* gs + = Calamares::JobQueue::instance() ? Calamares::JobQueue::instance()->globalStorage() : nullptr; + QVERIFY( gs ); + + { + QDir d( tempRoot.path() ); + d.mkdir( "etc" ); + } + + QVERIFY( !LOSHInfo::fromGlobalStorage().isValid() ); + QVariantList outerPartition; + QVariantMap innerPartition; + innerPartition.insert( "mountPoint", "/" ); + innerPartition.insert( "fs", "ext4" ); + innerPartition.insert( "luksMapperName", "root" ); + innerPartition.insert( "luksUUID", "0000" ); + outerPartition.append( innerPartition ); + innerPartition.remove( "mountPoint" ); + innerPartition.insert( "fs", "linuxswap" ); + innerPartition.insert( "luksMapperName", "swap" ); + innerPartition.insert( "luksUuid", "0001" ); + outerPartition.append( innerPartition ); + gs->insert( "partitions", outerPartition ); + QVERIFY( LOSHInfo::fromGlobalStorage().isValid() ); LOSHJob j; - j.setConfigurationMap(QVariantMap()); + j.setConfigurationMap( QVariantMap() ); auto jobresult = j.exec(); - QVERIFY(jobresult); - QVERIFY( QFile::exists( tempRoot.filePath( "etc/openswap.conf" ) ) ); + QVERIFY( jobresult ); + + { + QFile f( tempRoot.filePath( "etc/openswap.conf" ) ); + QVERIFY( f.exists() ); + QVERIFY( f.open( QIODevice::ReadOnly ) ); + cDebug() << f.readAll(); + } } From 046a228d62dc2623384056ecd610dd5f53355b92 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 8 Dec 2021 14:25:03 +0100 Subject: [PATCH 62/99] [luksopenswaphookcfg] Expand tests with lines more-closely tailored to the actual file-format --- src/modules/luksopenswaphookcfg/Tests.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/modules/luksopenswaphookcfg/Tests.cpp b/src/modules/luksopenswaphookcfg/Tests.cpp index 7ec623eaa..840bd9355 100644 --- a/src/modules/luksopenswaphookcfg/Tests.cpp +++ b/src/modules/luksopenswaphookcfg/Tests.cpp @@ -73,6 +73,12 @@ LOSHTests::testAssignmentExtraction_data() QTest::newRow( "assignment5" ) << QStringLiteral( "# # cows=1" ) << QStringLiteral( "cows" ); QTest::newRow( "assignment6" ) << QStringLiteral( "# moose='cool' # not cows" ) << QStringLiteral( "moose" ); QTest::newRow( "assignment7" ) << QStringLiteral( " moose=cows=42" ) << QStringLiteral( "moose" ); + QTest::newRow( "assignment8" ) << QStringLiteral( "#swap_device=/dev/something" ) + << QStringLiteral( "swap_device" ); + QTest::newRow( "assignment9" ) << QStringLiteral( "# swap_device=/dev/something" ) + << QStringLiteral( "swap_device" ); + QTest::newRow( "assignment10" ) << QStringLiteral( "swap_device=/dev/something" ) + << QStringLiteral( "swap_device" ); } void From 3870851074fff8c1b9d775627dac09180ac452be Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 8 Dec 2021 14:35:52 +0100 Subject: [PATCH 63/99] [luksopenswaphookcfg] Remove Python implementation --- src/modules/luksopenswaphookcfg/main.py | 100 ------------------------ 1 file changed, 100 deletions(-) delete mode 100644 src/modules/luksopenswaphookcfg/main.py diff --git a/src/modules/luksopenswaphookcfg/main.py b/src/modules/luksopenswaphookcfg/main.py deleted file mode 100644 index aaac8a31a..000000000 --- a/src/modules/luksopenswaphookcfg/main.py +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env python3 -# -*- coding: utf-8 -*- -# -# === This file is part of Calamares - === -# -# SPDX-FileCopyrightText: 2016 Teo Mrnjavac -# SPDX-FileCopyrightText: 2017 Alf Gaida -# SPDX-FileCopyrightText: 2019 Adriaan de Groot -# SPDX-License-Identifier: GPL-3.0-or-later -# -# Calamares is Free Software: see the License-Identifier above. -# - -import libcalamares -import os.path - - -import gettext -_ = gettext.translation("calamares-python", - localedir=libcalamares.utils.gettext_path(), - languages=libcalamares.utils.gettext_languages(), - fallback=True).gettext - - -def pretty_name(): - return _("Configuring encrypted swap.") - - -def write_openswap_conf(partitions, root_mount_point, openswap_conf_path): - swap_outer_uuid = "" - swap_mapper_name = "" - mountable_keyfile_device = "" - - for partition in partitions: - if partition["fs"] == "linuxswap" and "luksMapperName" in partition: - swap_outer_uuid = partition["luksUuid"] - swap_mapper_name = partition["luksMapperName"] - - elif partition["mountPoint"] == "/" and "luksMapperName" in partition: - mountable_keyfile_device = ( - "/dev/mapper/{!s}".format(partition["luksMapperName"]) - ) - - if not mountable_keyfile_device or not swap_outer_uuid: - return None - - swap_device_path = "/dev/disk/by-uuid/{!s}".format(swap_outer_uuid) - - lines = [] - with open(os.path.join(root_mount_point, - openswap_conf_path), 'r') as openswap_file: - lines = [x.strip() for x in openswap_file.readlines()] - - for i in range(len(lines)): - if lines[i].startswith("swap_device"): - lines[i] = "swap_device={!s}".format(swap_device_path) - - elif lines[i].startswith("crypt_swap_name"): - lines[i] = "crypt_swap_name={!s}".format(swap_mapper_name) - - elif lines[i].startswith("keyfile_device"): - lines[i] = "keyfile_device={!s}".format(mountable_keyfile_device) - - elif lines[i].startswith("keyfile_filename"): - lines[i] = "keyfile_filename=crypto_keyfile.bin" - - elif lines[i].startswith("#keyfile_device_mount_options"): - if libcalamares.globalstorage.contains("btrfsRootSubvolume"): - btrfs_root_subvolume = libcalamares.globalstorage.value("btrfsRootSubvolume") - lines[i] = "keyfile_device_mount_options=--options=subvol=" + btrfs_root_subvolume.lstrip("/") - - with open(os.path.join(root_mount_point, - openswap_conf_path), 'w') as openswap_file: - openswap_file.write("\n".join(lines) + "\n") - - return None - - -def run(): - """ - This module sets up the openswap hook for a resumable encrypted swap. - :return: - """ - - root_mount_point = libcalamares.globalstorage.value("rootMountPoint") - openswap_conf_path = libcalamares.job.configuration["configFilePath"] - partitions = libcalamares.globalstorage.value("partitions") - - if not partitions: - libcalamares.utils.warning("partitions is empty, {!s}".format(partitions)) - return (_("Configuration Error"), - _("No partitions are defined for 
{!s}
to use.").format("luksopenswaphookcfg")) - if not root_mount_point: - libcalamares.utils.warning("rootMountPoint is empty, {!s}".format(root_mount_point)) - return (_("Configuration Error"), - _("No root mount point is given for 
{!s}
to use.").format("luksopenswaphookcfg")) - - openswap_conf_path = openswap_conf_path.lstrip('/') - - return write_openswap_conf(partitions, root_mount_point, openswap_conf_path) From b4afedc79e49fc678ba23d5d93a18756a89c2593 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 10 Dec 2021 15:46:11 +0100 Subject: [PATCH 64/99] Changes: pre-release housekeeping --- CHANGES-3.2 | 4 +++- CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGES-3.2 b/CHANGES-3.2 index 566a61ed9..cb342ed53 100644 --- a/CHANGES-3.2 +++ b/CHANGES-3.2 @@ -7,7 +7,7 @@ contributors are listed. Note that Calamares does not have a historical changelog -- this log starts with version 3.2.0. The release notes on the website will have to do for older versions. -# 3.2.49 (unreleased) # +# 3.2.49 (2021-12-10) # This release contains contributions from (alphabetically by first name): - Artem Grinev @@ -22,6 +22,8 @@ configuration (and to use *preservefiles* if needed). to the size of the screen. (Thanks Artem) ## Modules ## + - *bootloader* better supports multiple installations of the same OS. + - *mount* supports btrfs subvolumes on subdirectories of / now. - *partition* now supports "deep" btrfs subvolume names, e.g. a separate subvolume for `/usr/local`. (Thanks Evan) - The *umount* module now warns if the "preserve log file" feature is used. diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a55eae1c..03dfdad22 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,7 +45,7 @@ project( CALAMARES LANGUAGES C CXX ) -set( CALAMARES_VERSION_RC 1 ) # Set to 0 during release cycle, 1 during development +set( CALAMARES_VERSION_RC 0 ) # Set to 0 during release cycle, 1 during development if( CALAMARES_VERSION_RC EQUAL 1 AND CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR ) message( FATAL_ERROR "Do not build development versions in the source-directory." ) endif() From 3cdb019de7f2ad6c5cfa92a39a70212a3a3ec42a Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Fri, 10 Dec 2021 15:55:58 +0100 Subject: [PATCH 65/99] i18n: [calamares] Automatic merge of Transifex translations --- lang/calamares_sv.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/calamares_sv.ts b/lang/calamares_sv.ts index 64946e710..bd6add603 100644 --- a/lang/calamares_sv.ts +++ b/lang/calamares_sv.ts @@ -703,7 +703,7 @@ Alla ändringar kommer att gå förlorade. Successfully closed mapper device %1. - + Framgångsrikt stängde krypterad enhet %1. From 7ac42b5f4060f97dc560891d4a3178feb7c41362 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 10 Dec 2021 16:44:01 +0100 Subject: [PATCH 66/99] [umount] Tests don't like an empty config - modules with no configuration should be marked 'noconfig', but umount is special: it has no **useful** configuration (maybe no **non-deprecated** configuration), but isn't marked 'noconfig' **yet**. --- src/modules/umount/umount.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/umount/umount.conf b/src/modules/umount/umount.conf index 062f7ac4b..7c11f4db6 100644 --- a/src/modules/umount/umount.conf +++ b/src/modules/umount/umount.conf @@ -27,3 +27,4 @@ # example when using a log created by `sudo calamares -d`: #srcLog: "/home/live/installation.log" #destLog: "/var/log/installation.log" +srcLog: "/bogus/just/do/not/use/this/anymore.txt" From adaed528183fb4f245c374cd5b535b850ae10944 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Fri, 10 Dec 2021 17:01:42 +0100 Subject: [PATCH 67/99] Changes: post-release housekeeping --- CHANGES-3.2 | 12 ++++++++++++ CMakeLists.txt | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGES-3.2 b/CHANGES-3.2 index cb342ed53..5f032ab58 100644 --- a/CHANGES-3.2 +++ b/CHANGES-3.2 @@ -7,6 +7,18 @@ contributors are listed. Note that Calamares does not have a historical changelog -- this log starts with version 3.2.0. The release notes on the website will have to do for older versions. +# 3.2.50 (unreleased) # + +This release contains contributions from (alphabetically by first name): + - No external contributors yet + +## Core ## + - No core changes yet + +## Modules ## + - No module changes yet + + # 3.2.49 (2021-12-10) # This release contains contributions from (alphabetically by first name): diff --git a/CMakeLists.txt b/CMakeLists.txt index 03dfdad22..15f40803e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,11 +41,11 @@ # TODO:3.3: Require CMake 3.12 cmake_minimum_required( VERSION 3.3 FATAL_ERROR ) project( CALAMARES - VERSION 3.2.49 + VERSION 3.2.50 LANGUAGES C CXX ) -set( CALAMARES_VERSION_RC 0 ) # Set to 0 during release cycle, 1 during development +set( CALAMARES_VERSION_RC 1 ) # Set to 0 during release cycle, 1 during development if( CALAMARES_VERSION_RC EQUAL 1 AND CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR ) message( FATAL_ERROR "Do not build development versions in the source-directory." ) endif() From 03da766b396d57d6dc050ee1c5c25e5d1a73f862 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 11 Dec 2021 13:19:08 +0100 Subject: [PATCH 68/99] [partition] Keep 64-bit integers for swap sizes FIXES #1849 --- src/modules/partition/core/PartitionActions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/partition/core/PartitionActions.cpp b/src/modules/partition/core/PartitionActions.cpp index 8226499b4..a56446a39 100644 --- a/src/modules/partition/core/PartitionActions.cpp +++ b/src/modules/partition/core/PartitionActions.cpp @@ -71,7 +71,7 @@ swapSuggestion( const qint64 availableSpaceB, Config::SwapChoice swap ) // Allow for a fudge factor - suggestedSwapSizeB = qRound( suggestedSwapSizeB * overestimationFactor ); + suggestedSwapSizeB = qRound64( suggestedSwapSizeB * overestimationFactor ); // don't use more than 10% of available space if ( !ensureSuspendToDisk ) From db86c2463858efae726178860183c2d8dfb5ded0 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 11 Dec 2021 13:23:23 +0100 Subject: [PATCH 69/99] Changes: pre-hotfix-release housekeeping --- CHANGES-3.2 | 12 +++--------- CMakeLists.txt | 4 ++-- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/CHANGES-3.2 b/CHANGES-3.2 index 5f032ab58..bd04ee64c 100644 --- a/CHANGES-3.2 +++ b/CHANGES-3.2 @@ -7,16 +7,10 @@ contributors are listed. Note that Calamares does not have a historical changelog -- this log starts with version 3.2.0. The release notes on the website will have to do for older versions. -# 3.2.50 (unreleased) # +# 3.2.49.1 (2021-12-11) # -This release contains contributions from (alphabetically by first name): - - No external contributors yet - -## Core ## - - No core changes yet - -## Modules ## - - No module changes yet +This is a hot-fix release, to fix a regression in the calculation of +swap-size. Reported by EndeavourOS (Joe Kamprad) and Xero Linux. # 3.2.49 (2021-12-10) # diff --git a/CMakeLists.txt b/CMakeLists.txt index 15f40803e..5ad72ae47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,11 +41,11 @@ # TODO:3.3: Require CMake 3.12 cmake_minimum_required( VERSION 3.3 FATAL_ERROR ) project( CALAMARES - VERSION 3.2.50 + VERSION 3.2.49.1 LANGUAGES C CXX ) -set( CALAMARES_VERSION_RC 1 ) # Set to 0 during release cycle, 1 during development +set( CALAMARES_VERSION_RC 0 ) # Set to 0 during release cycle, 1 during development if( CALAMARES_VERSION_RC EQUAL 1 AND CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR ) message( FATAL_ERROR "Do not build development versions in the source-directory." ) endif() From 132ebd2c2dfbab92c2b4b1d8e072f51f79ebc025 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 11 Dec 2021 15:12:51 +0100 Subject: [PATCH 70/99] [networkcfg] NetworkManager files are UTF-8 encoded The filenames don't matter, but the contents of the file are also UTF-8, and depending on the default encoding of the Python interpreter, this can fail on non-ASCII characters in the file. Set the encoding explicitly while reading and writing the NetworkManager configuration files. FIXES #1848 --- src/modules/networkcfg/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/networkcfg/main.py b/src/modules/networkcfg/main.py index 0ee47c1aa..807fdf613 100644 --- a/src/modules/networkcfg/main.py +++ b/src/modules/networkcfg/main.py @@ -73,12 +73,12 @@ def replace_username(nm_config_filename, live_user, target_user): if not os.path.exists(nm_config_filename): return - with open(nm_config_filename, "r") as network_conf: + with open(nm_config_filename, "r", encoding="UTF-8") as network_conf: text = network_conf.readlines() live_permissions = 'permissions=user:{}:;'.format(live_user) target_permissions = 'permissions=user:{}:;\n'.format(target_user) - with open(nm_config_filename, "w") as network_conf: + with open(nm_config_filename, "w", encoding="UTF-8") as network_conf: for line in text: if live_permissions in line: line = target_permissions From 6261f8a5cb420e38521f2cb4aeb78009e1f79de7 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 11 Dec 2021 15:31:59 +0100 Subject: [PATCH 71/99] Changes: post-release housekeeping --- CHANGES-3.2 | 15 +++++++++++++++ CMakeLists.txt | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/CHANGES-3.2 b/CHANGES-3.2 index bd04ee64c..cca35f9e7 100644 --- a/CHANGES-3.2 +++ b/CHANGES-3.2 @@ -7,6 +7,21 @@ contributors are listed. Note that Calamares does not have a historical changelog -- this log starts with version 3.2.0. The release notes on the website will have to do for older versions. +# 3.2.50 (unreleased) # + +This release contains contributions from (alphabetically by first name): + - No external contributors yet + +## Core ## + - No core changes yet + +## Modules ## + - *networkcfg* could fail to update the NetworkManager configuration + if the SSID or username contained non-ASCII characters **and** the + default Python text-file encoding was set to ASCII. The files are + now read and written in UTF-8, explicitly. #1848 + + # 3.2.49.1 (2021-12-11) # This is a hot-fix release, to fix a regression in the calculation of diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ad72ae47..15f40803e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,11 +41,11 @@ # TODO:3.3: Require CMake 3.12 cmake_minimum_required( VERSION 3.3 FATAL_ERROR ) project( CALAMARES - VERSION 3.2.49.1 + VERSION 3.2.50 LANGUAGES C CXX ) -set( CALAMARES_VERSION_RC 0 ) # Set to 0 during release cycle, 1 during development +set( CALAMARES_VERSION_RC 1 ) # Set to 0 during release cycle, 1 during development if( CALAMARES_VERSION_RC EQUAL 1 AND CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR ) message( FATAL_ERROR "Do not build development versions in the source-directory." ) endif() From 5b225cf960e9c948f590f3c3f4d8775ad073cdf5 Mon Sep 17 00:00:00 2001 From: arcolinuxz Date: Sat, 11 Dec 2021 18:11:45 +0100 Subject: [PATCH 72/99] [preservefiles] Put the logs in /var/log --- CHANGES-3.2 | 2 +- src/modules/preservefiles/preservefiles.conf | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/CHANGES-3.2 b/CHANGES-3.2 index cca35f9e7..93231b57a 100644 --- a/CHANGES-3.2 +++ b/CHANGES-3.2 @@ -10,7 +10,7 @@ website will have to do for older versions. # 3.2.50 (unreleased) # This release contains contributions from (alphabetically by first name): - - No external contributors yet + - Erik Dubois ## Core ## - No core changes yet diff --git a/src/modules/preservefiles/preservefiles.conf b/src/modules/preservefiles/preservefiles.conf index 6af0872d7..d862e35e9 100644 --- a/src/modules/preservefiles/preservefiles.conf +++ b/src/modules/preservefiles/preservefiles.conf @@ -34,15 +34,13 @@ # - *log*, for the complete log file (up to the moment the preservefiles # module is run), # - *config*, for a JSON dump of the contents of global storage ---- files: - - /etc/oem-information - from: log - dest: /root/install.log - perm: root:wheel:644 + dest: /var/log/Calamares.log + perm: root:wheel:600 - from: config - dest: /root/install.json - perm: root:wheel:400 + dest: /var/log/Camamares-install.json + perm: root:wheel:600 # The *perm* key contains a default value to apply to all files listed # above that do not have a *perm* key of their own. If not set, From becb1d57103eb0f423404f6e91ac6c14f119ba4d Mon Sep 17 00:00:00 2001 From: Johannes Kamprad Date: Sun, 12 Dec 2021 01:22:22 +0100 Subject: [PATCH 73/99] Update preservefiles.conf --- src/modules/preservefiles/preservefiles.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/preservefiles/preservefiles.conf b/src/modules/preservefiles/preservefiles.conf index d862e35e9..1c23a93de 100644 --- a/src/modules/preservefiles/preservefiles.conf +++ b/src/modules/preservefiles/preservefiles.conf @@ -39,7 +39,7 @@ files: dest: /var/log/Calamares.log perm: root:wheel:600 - from: config - dest: /var/log/Camamares-install.json + dest: /var/log/Calamares-install.json perm: root:wheel:600 # The *perm* key contains a default value to apply to all files listed From b1ecbb4151f22a74be4b4997dbbafbc77ef8b9ba Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sun, 12 Dec 2021 00:33:55 +0100 Subject: [PATCH 74/99] [preservefiles] Start cleanup of structure, polymorphism --- src/modules/preservefiles/PreserveFiles.cpp | 51 +++++++++++++++------ src/modules/preservefiles/PreserveFiles.h | 25 ++-------- 2 files changed, 43 insertions(+), 33 deletions(-) diff --git a/src/modules/preservefiles/PreserveFiles.cpp b/src/modules/preservefiles/PreserveFiles.cpp index b235aac93..d46563185 100644 --- a/src/modules/preservefiles/PreserveFiles.cpp +++ b/src/modules/preservefiles/PreserveFiles.cpp @@ -18,6 +18,30 @@ #include +enum class ItemType +{ + None, + Path, + Log, + Config +}; + +struct Item +{ + QString source; + QString dest; + CalamaresUtils::Permissions perm; + ItemType type; + + Item( const QString& src, const QString& d, CalamaresUtils::Permissions p, ItemType t ) + : source( src ) + , dest( d ) + , perm( std::move( p ) ) + , type( t ) + { + } +}; + using namespace CalamaresUtils::Units; QString @@ -113,7 +137,7 @@ copy_file( const QString& source, const QString& dest ) Calamares::JobResult PreserveFiles::exec() { - if ( m_items.isEmpty() ) + if ( m_items.empty() ) { return Calamares::JobResult::error( tr( "No files configured to save for later." ) ); } @@ -124,18 +148,18 @@ PreserveFiles::exec() prefix.append( '/' ); } - int count = 0; - for ( const auto& it : m_items ) + size_t count = 0; + for ( const auto& it : qAsConst( m_items ) ) { - QString source = it.source; - QString bare_dest = atReplacements( it.dest ); + QString source = it->source; + QString bare_dest = atReplacements( it->dest ); QString dest = prefix + bare_dest; - if ( it.type == ItemType::Log ) + if ( it->type == ItemType::Log ) { source = Logger::logFile(); } - if ( it.type == ItemType::Config ) + if ( it->type == ItemType::Config ) { if ( !Calamares::JobQueue::instance()->globalStorage()->saveJson( dest ) ) { @@ -154,9 +178,9 @@ PreserveFiles::exec() { if ( copy_file( source, dest ) ) { - if ( it.perm.isValid() ) + if ( it->perm.isValid() ) { - if ( !it.perm.apply( CalamaresUtils::System::instance()->targetPath( bare_dest ) ) ) + if ( !it->perm.apply( CalamaresUtils::System::instance()->targetPath( bare_dest ) ) ) { cWarning() << "Could not set attributes of" << bare_dest; } @@ -167,7 +191,7 @@ PreserveFiles::exec() } } - return count == m_items.count() + return count == m_items.size() ? Calamares::JobResult::ok() : Calamares::JobResult::error( tr( "Not all of the configured files could be preserved." ) ); } @@ -202,8 +226,8 @@ PreserveFiles::setConfigurationMap( const QVariantMap& configurationMap ) { QString filename = li.toString(); if ( !filename.isEmpty() ) - m_items.append( - Item { filename, filename, CalamaresUtils::Permissions( defaultPermissions ), ItemType::Path } ); + m_items.push_back( std::make_unique< Item >( + filename, filename, CalamaresUtils::Permissions( defaultPermissions ), ItemType::Path ) ); else { cDebug() << "Empty filename for preservefiles, item" << c; @@ -231,7 +255,8 @@ PreserveFiles::setConfigurationMap( const QVariantMap& configurationMap ) } else { - m_items.append( Item { QString(), dest, CalamaresUtils::Permissions( perm ), t } ); + m_items.push_back( + std::make_unique< Item >( QString(), dest, CalamaresUtils::Permissions( perm ), t ) ); } } else diff --git a/src/modules/preservefiles/PreserveFiles.h b/src/modules/preservefiles/PreserveFiles.h index 7a0aab34d..a54005254 100644 --- a/src/modules/preservefiles/PreserveFiles.h +++ b/src/modules/preservefiles/PreserveFiles.h @@ -13,31 +13,16 @@ #include "utils/Permissions.h" #include "utils/PluginFactory.h" -#include -#include -#include +#include +#include + +struct Item; class PLUGINDLLEXPORT PreserveFiles : public Calamares::CppJob { Q_OBJECT - enum class ItemType - { - None, - Path, - Log, - Config - }; - - struct Item - { - QString source; - QString dest; - CalamaresUtils::Permissions perm; - ItemType type; - }; - - using ItemList = QList< Item >; + using ItemList = std::vector< std::unique_ptr< Item > >; public: explicit PreserveFiles( QObject* parent = nullptr ); From 238672ef78a43e4261bedf2ac419c3f0ac606952 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 13 Dec 2021 13:00:28 +0100 Subject: [PATCH 75/99] [preservefiles] Split file-items into separate header Put the Item class in a separate header; give it functionality to create itself from Variants (e.g. from the configuration data) and to run itself (do whatever the item is supposed to do). This makes the polymorphic approach unnecessary: we just have items that are sufficiently smart. This moves do-a-thing to the Item, while the Job now has one job: be a loop around creating Items and running items. --- src/modules/preservefiles/CMakeLists.txt | 1 + src/modules/preservefiles/Item.cpp | 160 +++++++++++++++++ src/modules/preservefiles/Item.h | 72 ++++++++ src/modules/preservefiles/PreserveFiles.cpp | 184 ++------------------ src/modules/preservefiles/PreserveFiles.h | 8 +- 5 files changed, 249 insertions(+), 176 deletions(-) create mode 100644 src/modules/preservefiles/Item.cpp create mode 100644 src/modules/preservefiles/Item.h diff --git a/src/modules/preservefiles/CMakeLists.txt b/src/modules/preservefiles/CMakeLists.txt index 820c50a2b..e5cbe819c 100644 --- a/src/modules/preservefiles/CMakeLists.txt +++ b/src/modules/preservefiles/CMakeLists.txt @@ -9,6 +9,7 @@ calamares_add_plugin( preservefiles TYPE job EXPORT_MACRO PLUGINDLLEXPORT_PRO SOURCES + Item.cpp PreserveFiles.cpp # REQUIRES mount # To set the rootMountPoint SHARED_LIB diff --git a/src/modules/preservefiles/Item.cpp b/src/modules/preservefiles/Item.cpp new file mode 100644 index 000000000..bc2357876 --- /dev/null +++ b/src/modules/preservefiles/Item.cpp @@ -0,0 +1,160 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2018, 2021 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ + +#include "Item.h" + +#include "GlobalStorage.h" +#include "JobQueue.h" +#include "utils/CalamaresUtilsSystem.h" +#include "utils/Logger.h" +#include "utils/Units.h" + +#include + +using namespace CalamaresUtils::Units; + +static bool +copy_file( const QString& source, const QString& dest ) +{ + QFile sourcef( source ); + if ( !sourcef.open( QFile::ReadOnly ) ) + { + cWarning() << "Could not read" << source; + return false; + } + + QFile destf( dest ); + if ( !destf.open( QFile::WriteOnly ) ) + { + sourcef.close(); + cWarning() << "Could not open" << destf.fileName() << "for writing; could not copy" << source; + return false; + } + + QByteArray b; + do + { + b = sourcef.read( 1_MiB ); + destf.write( b ); + } while ( b.count() > 0 ); + + sourcef.close(); + destf.close(); + + return true; +} + +Item +Item::fromVariant( const QVariant& v, const CalamaresUtils::Permissions& defaultPermissions ) +{ + if ( v.type() == QVariant::String ) + { + QString filename = v.toString(); + if ( !filename.isEmpty() ) + { + return { filename, filename, defaultPermissions, ItemType::Path }; + } + else + { + cWarning() << "Empty filename for preservefiles, item" << v; + return {}; + } + } + else if ( v.type() == QVariant::Map ) + { + const auto map = v.toMap(); + + CalamaresUtils::Permissions perm( defaultPermissions ); + ItemType t = ItemType::None; + + { + QString perm_string = map[ "perm" ].toString(); + if ( !perm_string.isEmpty() ) + { + perm = CalamaresUtils::Permissions( perm_string ); + } + } + + { + QString from = map[ "from" ].toString(); + t = ( from == "log" ) ? ItemType::Log : ( from == "config" ) ? ItemType::Config : ItemType::None; + + if ( t == ItemType::None && !map[ "src" ].toString().isEmpty() ) + { + t = ItemType::Path; + } + } + + QString dest = map[ "dest" ].toString(); + if ( dest.isEmpty() ) + { + cWarning() << "Empty dest for preservefiles, item" << v; + return {}; + } + + switch ( t ) + { + case ItemType::Config: + return { QString(), dest, perm, t }; + case ItemType::Log: + return { QString(), dest, perm, t }; + case ItemType::Path: + return { map[ "src" ].toString(), dest, perm, t }; + case ItemType::None: + cWarning() << "Invalid type for preservefiles, item" << v; + return {}; + } + } + else + { + cWarning() << "Invalid type for preservefiles, item" << v; + return {}; + } +} + + +bool +Item::exec( const std::function< QString( QString ) >& replacements ) const +{ + QString expanded_dest = replacements( dest ); + QString full_dest = CalamaresUtils::System::instance()->targetPath( expanded_dest ); + + bool success = false; + switch ( type ) + { + case ItemType::None: + cWarning() << "Invalid item for preservefiles skipped."; + return false; + case ItemType::Config: + if ( !( success = Calamares::JobQueue::instance()->globalStorage()->saveJson( full_dest ) ) ) + { + cWarning() << "Could not write a JSON dump of global storage to" << full_dest; + } + break; + case ItemType::Log: + if ( !( success = copy_file( Logger::logFile(), full_dest ) ) ) + { + cWarning() << "Could not preserve log file to" << full_dest; + } + break; + case ItemType::Path: + if ( !( success = copy_file( source, full_dest ) ) ) + { + cWarning() << "Could not preserve" << source << "to" << full_dest; + } + break; + } + if ( !success ) + { + CalamaresUtils::System::instance()->removeTargetFile( expanded_dest ); + return false; + } + else + { + return perm.apply( full_dest ); + } +} diff --git a/src/modules/preservefiles/Item.h b/src/modules/preservefiles/Item.h new file mode 100644 index 000000000..cd15e2042 --- /dev/null +++ b/src/modules/preservefiles/Item.h @@ -0,0 +1,72 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2018, 2021 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + */ +#ifndef PRESERVEFILES_ITEM_H +#define PRESERVEFILES_ITEM_H + +#include "utils/Permissions.h" + +#include +#include + +#include + +enum class ItemType +{ + None, + Path, + Log, + Config +}; + +/** @brief Represents one item to copy + * + * All item types need a destination (to place the data), this is + * intepreted within the target system. All items need a permission, + * which is applied to the data once written. + * + * The source may be a path, but not all types need a source. + */ +class Item +{ + QString source; + QString dest; + CalamaresUtils::Permissions perm; + ItemType type; + +public: + Item( const QString& src, const QString& d, CalamaresUtils::Permissions p, ItemType t ) + : source( src ) + , dest( d ) + , perm( std::move( p ) ) + , type( t ) + { + } + + Item() + : type( ItemType::None ) + { + } + + operator bool() const { return type != ItemType::None; } + + bool exec( const std::function< QString( QString ) >& replacements ) const; + + + /** @brief Create an Item -- or one of its subclasses -- from @p v + * + * Depending on the structure and contents of @p v, a pointer + * to an Item is returned. If @p v cannot be interpreted meaningfully, + * then a nullptr is returned. + * + * When the entry contains a *perm* key, use that permission, otherwise + * apply @p defaultPermissions to the item. + */ + static Item fromVariant( const QVariant& v, const CalamaresUtils::Permissions& defaultPermissions ); +}; + + +#endif diff --git a/src/modules/preservefiles/PreserveFiles.cpp b/src/modules/preservefiles/PreserveFiles.cpp index d46563185..4adde85bb 100644 --- a/src/modules/preservefiles/PreserveFiles.cpp +++ b/src/modules/preservefiles/PreserveFiles.cpp @@ -7,70 +7,20 @@ #include "PreserveFiles.h" +#include "Item.h" + #include "CalamaresVersion.h" #include "GlobalStorage.h" #include "JobQueue.h" #include "utils/CalamaresUtilsSystem.h" #include "utils/CommandList.h" #include "utils/Logger.h" -#include "utils/Permissions.h" #include "utils/Units.h" #include -enum class ItemType -{ - None, - Path, - Log, - Config -}; - -struct Item -{ - QString source; - QString dest; - CalamaresUtils::Permissions perm; - ItemType type; - - Item( const QString& src, const QString& d, CalamaresUtils::Permissions p, ItemType t ) - : source( src ) - , dest( d ) - , perm( std::move( p ) ) - , type( t ) - { - } -}; - using namespace CalamaresUtils::Units; -QString -targetPrefix() -{ - if ( CalamaresUtils::System::instance()->doChroot() ) - { - Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage(); - if ( gs && gs->contains( "rootMountPoint" ) ) - { - QString r = gs->value( "rootMountPoint" ).toString(); - if ( !r.isEmpty() ) - { - return r; - } - else - { - cDebug() << "RootMountPoint is empty"; - } - } - else - { - cDebug() << "No rootMountPoint defined, preserving files to '/'"; - } - } - - return QLatin1String( "/" ); -} - QString atReplacements( QString s ) { @@ -103,37 +53,6 @@ PreserveFiles::prettyName() const return tr( "Saving files for later ..." ); } -static bool -copy_file( const QString& source, const QString& dest ) -{ - QFile sourcef( source ); - if ( !sourcef.open( QFile::ReadOnly ) ) - { - cWarning() << "Could not read" << source; - return false; - } - - QFile destf( dest ); - if ( !destf.open( QFile::WriteOnly ) ) - { - sourcef.close(); - cWarning() << "Could not open" << destf.fileName() << "for writing; could not copy" << source; - return false; - } - - QByteArray b; - do - { - b = sourcef.read( 1_MiB ); - destf.write( b ); - } while ( b.count() > 0 ); - - sourcef.close(); - destf.close(); - - return true; -} - Calamares::JobResult PreserveFiles::exec() { @@ -142,52 +61,20 @@ PreserveFiles::exec() return Calamares::JobResult::error( tr( "No files configured to save for later." ) ); } - QString prefix = targetPrefix(); - if ( !prefix.endsWith( '/' ) ) - { - prefix.append( '/' ); - } - - size_t count = 0; + int count = 0; for ( const auto& it : qAsConst( m_items ) ) { - QString source = it->source; - QString bare_dest = atReplacements( it->dest ); - QString dest = prefix + bare_dest; - - if ( it->type == ItemType::Log ) + if ( !it ) { - source = Logger::logFile(); + // Invalid entries are nullptr, ignore them but count as a success + // because they shouldn't block the installation. There are + // warnings in the log showing what the configuration problem is. + ++count; + continue; } - if ( it->type == ItemType::Config ) + if ( it.exec( atReplacements ) ) { - if ( !Calamares::JobQueue::instance()->globalStorage()->saveJson( dest ) ) - { - cWarning() << "Could not write a JSON dump of global storage to" << dest; - } - else - { - ++count; - } - } - else if ( source.isEmpty() ) - { - cWarning() << "Skipping unnamed source file for" << dest; - } - else - { - if ( copy_file( source, dest ) ) - { - if ( it->perm.isValid() ) - { - if ( !it->perm.apply( CalamaresUtils::System::instance()->targetPath( bare_dest ) ) ) - { - cWarning() << "Could not set attributes of" << bare_dest; - } - } - - ++count; - } + ++count; } } @@ -217,54 +104,11 @@ PreserveFiles::setConfigurationMap( const QVariantMap& configurationMap ) { defaultPermissions = QStringLiteral( "root:root:0400" ); } + CalamaresUtils::Permissions perm( defaultPermissions ); - QVariantList l = files.toList(); - unsigned int c = 0; - for ( const auto& li : l ) + for ( const auto& li : files.toList() ) { - if ( li.type() == QVariant::String ) - { - QString filename = li.toString(); - if ( !filename.isEmpty() ) - m_items.push_back( std::make_unique< Item >( - filename, filename, CalamaresUtils::Permissions( defaultPermissions ), ItemType::Path ) ); - else - { - cDebug() << "Empty filename for preservefiles, item" << c; - } - } - else if ( li.type() == QVariant::Map ) - { - const auto map = li.toMap(); - QString dest = map[ "dest" ].toString(); - QString from = map[ "from" ].toString(); - ItemType t = ( from == "log" ) ? ItemType::Log : ( from == "config" ) ? ItemType::Config : ItemType::None; - QString perm = map[ "perm" ].toString(); - if ( perm.isEmpty() ) - { - perm = defaultPermissions; - } - - if ( dest.isEmpty() ) - { - cDebug() << "Empty dest for preservefiles, item" << c; - } - else if ( t == ItemType::None ) - { - cDebug() << "Invalid type for preservefiles, item" << c; - } - else - { - m_items.push_back( - std::make_unique< Item >( QString(), dest, CalamaresUtils::Permissions( perm ), t ) ); - } - } - else - { - cDebug() << "Invalid type for preservefiles, item" << c; - } - - ++c; + m_items.push_back( Item::fromVariant( li, perm ) ); } } diff --git a/src/modules/preservefiles/PreserveFiles.h b/src/modules/preservefiles/PreserveFiles.h index a54005254..dfd2804e3 100644 --- a/src/modules/preservefiles/PreserveFiles.h +++ b/src/modules/preservefiles/PreserveFiles.h @@ -10,19 +10,15 @@ #include "CppJob.h" #include "DllMacro.h" -#include "utils/Permissions.h" #include "utils/PluginFactory.h" -#include -#include - -struct Item; +class Item; class PLUGINDLLEXPORT PreserveFiles : public Calamares::CppJob { Q_OBJECT - using ItemList = std::vector< std::unique_ptr< Item > >; + using ItemList = QList< Item >; public: explicit PreserveFiles( QObject* parent = nullptr ); From 90f6ea1fc834eeb6d3ccde7539b1f9ce0830e273 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 13 Dec 2021 14:51:42 +0100 Subject: [PATCH 76/99] [preservefiles] polish the documentation --- src/modules/preservefiles/preservefiles.conf | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/modules/preservefiles/preservefiles.conf b/src/modules/preservefiles/preservefiles.conf index 1c23a93de..2853ac037 100644 --- a/src/modules/preservefiles/preservefiles.conf +++ b/src/modules/preservefiles/preservefiles.conf @@ -11,8 +11,9 @@ # is true, then these items are ignored (since the destination is the same # as the source). # - a map with a *dest* key. The *dest* value is a path interpreted in the -# target system (if dontChroot is true, in the host system). Relative paths -# are not recommended. There are three possible other keys in the map: +# target system (if the global *dontChroot* is true, then the host is the +# target as well). Relative paths are not recommended. There are three +# possible other keys in the map: # - *from*, which must have one of the values, below; it is used to # preserve files whose pathname is known to Calamares internally. # - *src*, to refer to a path interpreted in the host system. Relative @@ -23,17 +24,23 @@ # by owner). If set, the file's ownership and permissions are set to # those values within the target system; if not set, no permissions # are changed. -# Only one of the two source keys (either *from* or *src*) may be set. +# Exactly one of the two source keys (either *from* or *src*) must be set. # -# The target filename is modified as follows: -# - `@@ROOT@@` is replaced by the path to the target root (may be /) +# The target path (*dest*) is modified as follows: +# - `@@ROOT@@` is replaced by the path to the target root (may be /). +# There is never any reason to use this, since the *dest* is already +# interpreted in the target system. # - `@@USER@@` is replaced by the username entered by on the user # page (may be empty, for instance if no user page is enabled) # # Special values for the key *from* are: # - *log*, for the complete log file (up to the moment the preservefiles # module is run), -# - *config*, for a JSON dump of the contents of global storage +# - *config*, for a JSON dump of the contents of global storage. +# Note that this may contain sensitive information, and should be +# given restrictive permissions. +# +# files: - from: log dest: /var/log/Calamares.log From 8b5e49d9806b2c9fbfc5149a7e0107bceabfa40b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 13 Dec 2021 15:04:23 +0100 Subject: [PATCH 77/99] [preservefiles] Add (stub) tests --- src/modules/preservefiles/CMakeLists.txt | 9 ++- src/modules/preservefiles/Tests.cpp | 70 ++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 src/modules/preservefiles/Tests.cpp diff --git a/src/modules/preservefiles/CMakeLists.txt b/src/modules/preservefiles/CMakeLists.txt index e5cbe819c..5df637321 100644 --- a/src/modules/preservefiles/CMakeLists.txt +++ b/src/modules/preservefiles/CMakeLists.txt @@ -3,8 +3,6 @@ # SPDX-FileCopyrightText: 2020 Adriaan de Groot # SPDX-License-Identifier: BSD-2-Clause # -include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui ) - calamares_add_plugin( preservefiles TYPE job EXPORT_MACRO PLUGINDLLEXPORT_PRO @@ -15,3 +13,10 @@ calamares_add_plugin( preservefiles SHARED_LIB EMERGENCY ) + +calamares_add_test( + preservefilestest + SOURCES + Item.cpp + Tests.cpp +) diff --git a/src/modules/preservefiles/Tests.cpp b/src/modules/preservefiles/Tests.cpp new file mode 100644 index 000000000..3bf4aa833 --- /dev/null +++ b/src/modules/preservefiles/Tests.cpp @@ -0,0 +1,70 @@ +/* === This file is part of Calamares - === + * + * SPDX-FileCopyrightText: 2021 Adriaan de Groot + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Calamares is Free Software: see the License-Identifier above. + * + */ + +#include "Item.h" + +#include "Settings.h" +#include "utils/CalamaresUtilsSystem.h" +#include "utils/Logger.h" +#include "utils/Yaml.h" + +#include + +class PreserveFilesTests : public QObject +{ + Q_OBJECT +public: + PreserveFilesTests(); + ~PreserveFilesTests() override {} + +private Q_SLOTS: + void initTestCase(); + + /* + void testOneUrl(); + void testUrls_data(); + void testUrls(); + + void testBadConfigDoesNotResetUrls(); + */ + void testTrue(); +}; + +PreserveFilesTests::PreserveFilesTests() {} + +void +PreserveFilesTests::initTestCase() +{ + Logger::setupLogLevel( Logger::LOGDEBUG ); + cDebug() << "PreserveFiles test started."; + + // Ensure we have a system object, expect it to be a "bogus" one + CalamaresUtils::System* system = CalamaresUtils::System::instance(); + QVERIFY( system ); + cDebug() << Logger::SubEntry << "System @" << Logger::Pointer( system ); + + const auto* settings = Calamares::Settings::instance(); + if ( !settings ) + { + (void)new Calamares::Settings( true ); + } +} + +void +PreserveFilesTests::testTrue() +{ + QVERIFY( true ); +} + + +QTEST_GUILESS_MAIN( PreserveFilesTests ) + +#include "utils/moc-warnings.h" + +#include "Tests.moc" From a1b7ba0dc59cd0d70146cc7872808f68209f7c1e Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 13 Dec 2021 15:44:07 +0100 Subject: [PATCH 78/99] [preservefiles] Accessor for item-type (needed for tests) --- src/modules/preservefiles/Item.cpp | 2 +- src/modules/preservefiles/Item.h | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/modules/preservefiles/Item.cpp b/src/modules/preservefiles/Item.cpp index bc2357876..335110b75 100644 --- a/src/modules/preservefiles/Item.cpp +++ b/src/modules/preservefiles/Item.cpp @@ -124,7 +124,7 @@ Item::exec( const std::function< QString( QString ) >& replacements ) const QString full_dest = CalamaresUtils::System::instance()->targetPath( expanded_dest ); bool success = false; - switch ( type ) + switch ( m_type ) { case ItemType::None: cWarning() << "Invalid item for preservefiles skipped."; diff --git a/src/modules/preservefiles/Item.h b/src/modules/preservefiles/Item.h index cd15e2042..9bd8f9613 100644 --- a/src/modules/preservefiles/Item.h +++ b/src/modules/preservefiles/Item.h @@ -35,23 +35,24 @@ class Item QString source; QString dest; CalamaresUtils::Permissions perm; - ItemType type; + ItemType m_type; public: Item( const QString& src, const QString& d, CalamaresUtils::Permissions p, ItemType t ) : source( src ) , dest( d ) , perm( std::move( p ) ) - , type( t ) + , m_type( t ) { } Item() - : type( ItemType::None ) + : m_type( ItemType::None ) { } - operator bool() const { return type != ItemType::None; } + operator bool() const { return m_type != ItemType::None; } + ItemType type() const { return m_type; } bool exec( const std::function< QString( QString ) >& replacements ) const; From 3be52f8b37b841bcf420626cfcfed931b9175747 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 13 Dec 2021 15:44:32 +0100 Subject: [PATCH 79/99] [preservefiles] Expand tests with reading some existing config-items --- src/modules/preservefiles/Tests.cpp | 43 ++++++++++++++----- src/modules/preservefiles/tests/1a-log.conf | 7 +++ .../preservefiles/tests/1b-config.conf | 6 +++ src/modules/preservefiles/tests/1c-src.conf | 6 +++ .../preservefiles/tests/1d-filename.conf | 6 +++ src/modules/preservefiles/tests/1e-empty.conf | 3 ++ src/modules/preservefiles/tests/1f-bad.conf | 4 ++ 7 files changed, 65 insertions(+), 10 deletions(-) create mode 100644 src/modules/preservefiles/tests/1a-log.conf create mode 100644 src/modules/preservefiles/tests/1b-config.conf create mode 100644 src/modules/preservefiles/tests/1c-src.conf create mode 100644 src/modules/preservefiles/tests/1d-filename.conf create mode 100644 src/modules/preservefiles/tests/1e-empty.conf create mode 100644 src/modules/preservefiles/tests/1f-bad.conf diff --git a/src/modules/preservefiles/Tests.cpp b/src/modules/preservefiles/Tests.cpp index 3bf4aa833..57cefcf9d 100644 --- a/src/modules/preservefiles/Tests.cpp +++ b/src/modules/preservefiles/Tests.cpp @@ -12,6 +12,7 @@ #include "Settings.h" #include "utils/CalamaresUtilsSystem.h" #include "utils/Logger.h" +#include "utils/NamedEnum.h" #include "utils/Yaml.h" #include @@ -26,14 +27,8 @@ public: private Q_SLOTS: void initTestCase(); - /* - void testOneUrl(); - void testUrls_data(); - void testUrls(); - - void testBadConfigDoesNotResetUrls(); - */ - void testTrue(); + void testItems_data(); + void testItems(); }; PreserveFilesTests::PreserveFilesTests() {} @@ -57,11 +52,39 @@ PreserveFilesTests::initTestCase() } void -PreserveFilesTests::testTrue() +PreserveFilesTests::testItems_data() { - QVERIFY( true ); + QTest::addColumn< QString >( "filename" ); + QTest::addColumn< bool >( "ok" ); + QTest::addColumn< int >( "type_i" ); + + QTest::newRow( "log " ) << QString( "1a-log.conf" ) << true << smash( ItemType::Log ); + QTest::newRow( "config " ) << QString( "1b-config.conf" ) << true << smash( ItemType::Config ); + QTest::newRow( "src " ) << QString( "1c-src.conf" ) << true << smash( ItemType::Path ); + QTest::newRow( "filename" ) << QString( "1d-filename.conf" ) << true << smash( ItemType::Path ); + QTest::newRow( "empty " ) << QString( "1e-empty.conf" ) << false << smash( ItemType::None ); + QTest::newRow( "bad " ) << QString( "1f-bad.conf" ) << false << smash( ItemType::None ); } +void +PreserveFilesTests::testItems() +{ + QFETCH( QString, filename ); + QFETCH( bool, ok ); + QFETCH( int, type_i ); + + QFile fi( QString( "%1/tests/%2" ).arg( BUILD_AS_TEST, filename ) ); + QVERIFY( fi.exists() ); + + bool config_file_ok = false; + const auto map = CalamaresUtils::loadYaml( fi, &config_file_ok ); + QVERIFY( config_file_ok ); + + CalamaresUtils::Permissions perm( QStringLiteral( "adridg:adridg:0750" ) ); + auto i = Item::fromVariant( map[ "item" ], perm ); + QCOMPARE( bool( i ), ok ); + QCOMPARE( smash( i.type() ), type_i ); +} QTEST_GUILESS_MAIN( PreserveFilesTests ) diff --git a/src/modules/preservefiles/tests/1a-log.conf b/src/modules/preservefiles/tests/1a-log.conf new file mode 100644 index 000000000..d589d4dfb --- /dev/null +++ b/src/modules/preservefiles/tests/1a-log.conf @@ -0,0 +1,7 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +item: + from: log + dest: /var/log/Calamares.log + perm: root:wheel:601 diff --git a/src/modules/preservefiles/tests/1b-config.conf b/src/modules/preservefiles/tests/1b-config.conf new file mode 100644 index 000000000..409dc89d9 --- /dev/null +++ b/src/modules/preservefiles/tests/1b-config.conf @@ -0,0 +1,6 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +item: + from: config + dest: /var/log/Calamares-install.json + perm: root:wheel:600 diff --git a/src/modules/preservefiles/tests/1c-src.conf b/src/modules/preservefiles/tests/1c-src.conf new file mode 100644 index 000000000..130ddd06f --- /dev/null +++ b/src/modules/preservefiles/tests/1c-src.conf @@ -0,0 +1,6 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +item: + src: /root/.cache/calamares/session.log + dest: /var/log/Calamares.log + perm: root:wheel:600 diff --git a/src/modules/preservefiles/tests/1d-filename.conf b/src/modules/preservefiles/tests/1d-filename.conf new file mode 100644 index 000000000..130ddd06f --- /dev/null +++ b/src/modules/preservefiles/tests/1d-filename.conf @@ -0,0 +1,6 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +item: + src: /root/.cache/calamares/session.log + dest: /var/log/Calamares.log + perm: root:wheel:600 diff --git a/src/modules/preservefiles/tests/1e-empty.conf b/src/modules/preservefiles/tests/1e-empty.conf new file mode 100644 index 000000000..183d4e456 --- /dev/null +++ b/src/modules/preservefiles/tests/1e-empty.conf @@ -0,0 +1,3 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +item: [] diff --git a/src/modules/preservefiles/tests/1f-bad.conf b/src/modules/preservefiles/tests/1f-bad.conf new file mode 100644 index 000000000..b2c008955 --- /dev/null +++ b/src/modules/preservefiles/tests/1f-bad.conf @@ -0,0 +1,4 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +item: + bop: 1 From 445ed870ccf5be0237b29ea83da708487b702ea3 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 13 Dec 2021 15:53:15 +0100 Subject: [PATCH 80/99] [preservefiles] Simplify code to help gcc warnings --- src/modules/preservefiles/Item.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/modules/preservefiles/Item.cpp b/src/modules/preservefiles/Item.cpp index 335110b75..4354c2e08 100644 --- a/src/modules/preservefiles/Item.cpp +++ b/src/modules/preservefiles/Item.cpp @@ -109,11 +109,8 @@ Item::fromVariant( const QVariant& v, const CalamaresUtils::Permissions& default return {}; } } - else - { - cWarning() << "Invalid type for preservefiles, item" << v; - return {}; - } + cWarning() << "Invalid type for preservefiles, item" << v; + return {}; } From 778c2855f41d6d544d196c6ff60ed9ce40ff19f0 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 13 Dec 2021 16:34:38 +0100 Subject: [PATCH 81/99] [preservefiles] Introduce the notion of optionally-preserved files --- src/modules/preservefiles/Item.cpp | 10 +++--- src/modules/preservefiles/Item.h | 7 ++-- src/modules/preservefiles/PreserveFiles.cpp | 4 ++- src/modules/preservefiles/preservefiles.conf | 35 +++++++++++++------- 4 files changed, 37 insertions(+), 19 deletions(-) diff --git a/src/modules/preservefiles/Item.cpp b/src/modules/preservefiles/Item.cpp index 4354c2e08..2ae929e67 100644 --- a/src/modules/preservefiles/Item.cpp +++ b/src/modules/preservefiles/Item.cpp @@ -12,6 +12,7 @@ #include "utils/CalamaresUtilsSystem.h" #include "utils/Logger.h" #include "utils/Units.h" +#include "utils/Variant.h" #include @@ -56,7 +57,7 @@ Item::fromVariant( const QVariant& v, const CalamaresUtils::Permissions& default QString filename = v.toString(); if ( !filename.isEmpty() ) { - return { filename, filename, defaultPermissions, ItemType::Path }; + return { filename, filename, defaultPermissions, ItemType::Path, false }; } else { @@ -70,6 +71,7 @@ Item::fromVariant( const QVariant& v, const CalamaresUtils::Permissions& default CalamaresUtils::Permissions perm( defaultPermissions ); ItemType t = ItemType::None; + bool optional = CalamaresUtils::getBool( map, "optional", false ); { QString perm_string = map[ "perm" ].toString(); @@ -99,11 +101,11 @@ Item::fromVariant( const QVariant& v, const CalamaresUtils::Permissions& default switch ( t ) { case ItemType::Config: - return { QString(), dest, perm, t }; + return { QString(), dest, perm, t, optional }; case ItemType::Log: - return { QString(), dest, perm, t }; + return { QString(), dest, perm, t, optional }; case ItemType::Path: - return { map[ "src" ].toString(), dest, perm, t }; + return { map[ "src" ].toString(), dest, perm, t, optional }; case ItemType::None: cWarning() << "Invalid type for preservefiles, item" << v; return {}; diff --git a/src/modules/preservefiles/Item.h b/src/modules/preservefiles/Item.h index 9bd8f9613..896b9471f 100644 --- a/src/modules/preservefiles/Item.h +++ b/src/modules/preservefiles/Item.h @@ -35,14 +35,16 @@ class Item QString source; QString dest; CalamaresUtils::Permissions perm; - ItemType m_type; + ItemType m_type = ItemType::None; + bool m_optional = false; public: - Item( const QString& src, const QString& d, CalamaresUtils::Permissions p, ItemType t ) + Item( const QString& src, const QString& d, CalamaresUtils::Permissions p, ItemType t, bool optional ) : source( src ) , dest( d ) , perm( std::move( p ) ) , m_type( t ) + , m_optional( optional ) { } @@ -53,6 +55,7 @@ public: operator bool() const { return m_type != ItemType::None; } ItemType type() const { return m_type; } + bool isOptional() const { return m_optional; } bool exec( const std::function< QString( QString ) >& replacements ) const; diff --git a/src/modules/preservefiles/PreserveFiles.cpp b/src/modules/preservefiles/PreserveFiles.cpp index 4adde85bb..f904ded8c 100644 --- a/src/modules/preservefiles/PreserveFiles.cpp +++ b/src/modules/preservefiles/PreserveFiles.cpp @@ -72,7 +72,9 @@ PreserveFiles::exec() ++count; continue; } - if ( it.exec( atReplacements ) ) + // Try to preserve the file. If it's marked as optional, count it + // as a success regardless. + if ( it.exec( atReplacements ) || it.isOptional() ) { ++count; } diff --git a/src/modules/preservefiles/preservefiles.conf b/src/modules/preservefiles/preservefiles.conf index 2853ac037..4fb393b2e 100644 --- a/src/modules/preservefiles/preservefiles.conf +++ b/src/modules/preservefiles/preservefiles.conf @@ -7,24 +7,38 @@ # the list should have one of these forms: # # - an absolute path (probably within the host system). This will be preserved -# as the same path within the target system (chroot). If, globally, dontChroot -# is true, then these items are ignored (since the destination is the same -# as the source). +# as the same path within the target system (chroot). If, globally, +# *dontChroot* is true, then these items will be ignored (since the +# destination is the same as the source). # - a map with a *dest* key. The *dest* value is a path interpreted in the # target system (if the global *dontChroot* is true, then the host is the -# target as well). Relative paths are not recommended. There are three -# possible other keys in the map: +# target as well). Relative paths are not recommended. There are two +# ways to select the source data for the file: # - *from*, which must have one of the values, below; it is used to # preserve files whose pathname is known to Calamares internally. # - *src*, to refer to a path interpreted in the host system. Relative # paths are not recommended, and are interpreted relative to where # Calamares is being run. +# Exactly one of the two source keys (either *from* or *src*) must be set. +# +# Special values for the key *from* are: +# - *log*, for the complete log file (up to the moment the preservefiles +# module is run), +# - *config*, for a JSON dump of the contents of global storage. +# Note that this may contain sensitive information, and should be +# given restrictive permissions. +# +# A map with a *dest* key can have these additional fields: # - *perm*, is a colon-separated tuple of :: # where is in octal (e.g. 4777 for wide-open, 0400 for read-only # by owner). If set, the file's ownership and permissions are set to # those values within the target system; if not set, no permissions # are changed. -# Exactly one of the two source keys (either *from* or *src*) must be set. +# - *optional*, is a boolean; if this is set to `true` then failure to +# preserve the file will **not** be counted as a failure of the +# module, and installation will proceed. Set this for files that might +# not exist in the host system (e.g. nvidia configuration files that +# are created in some boot scenarios and not in others). # # The target path (*dest*) is modified as follows: # - `@@ROOT@@` is replaced by the path to the target root (may be /). @@ -33,12 +47,6 @@ # - `@@USER@@` is replaced by the username entered by on the user # page (may be empty, for instance if no user page is enabled) # -# Special values for the key *from* are: -# - *log*, for the complete log file (up to the moment the preservefiles -# module is run), -# - *config*, for a JSON dump of the contents of global storage. -# Note that this may contain sensitive information, and should be -# given restrictive permissions. # # files: @@ -48,6 +56,9 @@ files: - from: config dest: /var/log/Calamares-install.json perm: root:wheel:600 +# - src: /var/log/nvidia.conf +# dest: /var/log/Calamares-nvidia.conf +# optional: true # The *perm* key contains a default value to apply to all files listed # above that do not have a *perm* key of their own. If not set, From d3ed5663d08a8d76054f67e9fa57a72a7eda24dd Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 13 Dec 2021 16:56:07 +0100 Subject: [PATCH 82/99] [preservefiles] Add a schema-file --- .../preservefiles/preservefiles.schema.yaml | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 src/modules/preservefiles/preservefiles.schema.yaml diff --git a/src/modules/preservefiles/preservefiles.schema.yaml b/src/modules/preservefiles/preservefiles.schema.yaml new file mode 100644 index 000000000..65067ea97 --- /dev/null +++ b/src/modules/preservefiles/preservefiles.schema.yaml @@ -0,0 +1,37 @@ +# SPDX-FileCopyrightText: 2020 Adriaan de Groot +# SPDX-License-Identifier: GPL-3.0-or-later +--- +$schema: https://json-schema.org/schema# +$id: https://calamares.io/schemas/preservefiles +additionalProperties: false +type: object +properties: + # TODO: it's a particularly-formatted string + perm: { type: string } + files: + type: array + items: + # There are three entries here because: string, or an entry with + # a src (but no from) or an entry with from (but no src). + anyOf: + - type: string + - type: object + properties: + dest: { type: string } + src: { type: string } + # TODO: it's a particularly-formatted string + perm: { type: string } + optional: { type: boolean } + required: [ dest ] + additionalProperties: false + - type: object + properties: + dest: { type: string } + from: { type: string, enum: [config, log] } + # TODO: it's a particularly-formatted string + perm: { type: string } + optional: { type: boolean } + required: [ dest ] + additionalProperties: false + +required: [ files ] From dc7a1e43b73af5ab216df977ed518fd63f252585 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 11 Dec 2021 16:19:28 +0100 Subject: [PATCH 83/99] [partition] Add helper for running a KPMCore operation Most *partition* module jobs run an operation and turn that into a JobResult -- ok if it succeeds, and with the report text otherwise. Factor it out into a separate method that can be used as shorthand. --- src/modules/partition/core/KPMHelpers.cpp | 15 +++++++++++++++ src/modules/partition/core/KPMHelpers.h | 14 ++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/src/modules/partition/core/KPMHelpers.cpp b/src/modules/partition/core/KPMHelpers.cpp index ed105e28b..46efeb392 100644 --- a/src/modules/partition/core/KPMHelpers.cpp +++ b/src/modules/partition/core/KPMHelpers.cpp @@ -127,4 +127,19 @@ clonePartition( Device* device, Partition* partition ) partition->activeFlags() ); } +Calamares::JobResult +execute( Operation& operation, const QString& failureMessage ) +{ + operation.setStatus( Operation::StatusRunning ); + + Report report( nullptr ); + if ( operation.execute( report ) ) + { + return Calamares::JobResult::ok(); + } + + return Calamares::JobResult::error( failureMessage, report.toText() ); +} + + } // namespace KPMHelpers diff --git a/src/modules/partition/core/KPMHelpers.h b/src/modules/partition/core/KPMHelpers.h index 89a019f6c..1d40dd363 100644 --- a/src/modules/partition/core/KPMHelpers.h +++ b/src/modules/partition/core/KPMHelpers.h @@ -11,11 +11,13 @@ #ifndef KPMHELPERS_H #define KPMHELPERS_H -// KPMcore +#include "Job.h" + #include #include +#include +#include -// Qt #include #include @@ -72,6 +74,14 @@ Partition* createNewEncryptedPartition( PartitionNode* parent, Partition* clonePartition( Device* device, Partition* partition ); +/** @brief Return a result for an @p operation + * + * Executes the operation, and if successful, returns a success result. + * Otherwise returns an error using @p failureMessage as the primary part + * of the error, and details obtained from the operation. + */ +Calamares::JobResult execute( Operation& operation, const QString& failureMessage ); + } // namespace KPMHelpers #endif /* KPMHELPERS_H */ From 8bb2c5fc6b64af01bbbc7af44ac01b676acbd450 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 11 Dec 2021 16:28:13 +0100 Subject: [PATCH 84/99] [partition] Use convenience-method for running operation --- .../partition/jobs/CreatePartitionJob.cpp | 14 ++++---------- .../partition/jobs/DeletePartitionJob.cpp | 18 ++++++------------ 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/src/modules/partition/jobs/CreatePartitionJob.cpp b/src/modules/partition/jobs/CreatePartitionJob.cpp index 3e51ed598..248104226 100644 --- a/src/modules/partition/jobs/CreatePartitionJob.cpp +++ b/src/modules/partition/jobs/CreatePartitionJob.cpp @@ -11,7 +11,9 @@ #include "CreatePartitionJob.h" +#include "core/KPMHelpers.h" #include "core/PartitionInfo.h" + #include "partition/FileSystem.h" #include "partition/PartitionQuery.h" #include "utils/CalamaresUtilsSystem.h" @@ -273,17 +275,9 @@ CreatePartitionJob::exec() return createZfs( m_partition, m_device ); } - Report report( nullptr ); NewOperation op( *m_device, m_partition ); - op.setStatus( Operation::StatusRunning ); - - QString message = tr( "The installer failed to create partition on disk '%1'." ).arg( m_device->name() ); - if ( op.execute( report ) ) - { - return Calamares::JobResult::ok(); - } - - return Calamares::JobResult::error( message, report.toText() ); + return KPMHelpers::execute( + op, tr( "The installer failed to create partition on disk '%1'." ).arg( m_device->name() ) ); } void diff --git a/src/modules/partition/jobs/DeletePartitionJob.cpp b/src/modules/partition/jobs/DeletePartitionJob.cpp index a678b5e90..e573d1d3c 100644 --- a/src/modules/partition/jobs/DeletePartitionJob.cpp +++ b/src/modules/partition/jobs/DeletePartitionJob.cpp @@ -10,9 +10,11 @@ */ #include "DeletePartitionJob.h" + +#include "core/KPMHelpers.h" + #include "utils/CalamaresUtilsSystem.h" -// KPMcore #include #include #include @@ -45,7 +47,7 @@ removePartition( Partition* partition ) auto r = CalamaresUtils::System::instance()->runCommand( { "sfdisk", "--delete", "--force", partition->devicePath(), QString::number( partition->number() ) }, std::chrono::seconds( 5 ) ); - if ( r.getExitCode() !=0 || r.getOutput().contains("failed") ) + if ( r.getExitCode() != 0 || r.getOutput().contains( "failed" ) ) { return Calamares::JobResult::error( QCoreApplication::translate( DeletePartitionJob::staticMetaObject.className(), "Deletion Failed" ), @@ -96,17 +98,9 @@ DeletePartitionJob::exec() return removePartition( m_partition ); } - Report report( nullptr ); DeleteOperation op( *m_device, m_partition ); - op.setStatus( Operation::StatusRunning ); - - QString message = tr( "The installer failed to delete partition %1." ).arg( m_partition->devicePath() ); - if ( op.execute( report ) ) - { - return Calamares::JobResult::ok(); - } - - return Calamares::JobResult::error( message, report.toText() ); + return KPMHelpers::execute( op, + tr( "The installer failed to delete partition %1." ).arg( m_partition->devicePath() ) ); } void From 1356012fb468c46159baf5699aa6537c7c818b08 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 11 Dec 2021 21:35:09 +0100 Subject: [PATCH 85/99] [partition] With rvalue, code becomes even more compact --- src/modules/partition/core/KPMHelpers.cpp | 2 +- src/modules/partition/core/KPMHelpers.h | 2 +- src/modules/partition/jobs/CreatePartitionJob.cpp | 4 ++-- src/modules/partition/jobs/DeletePartitionJob.cpp | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/modules/partition/core/KPMHelpers.cpp b/src/modules/partition/core/KPMHelpers.cpp index 46efeb392..f836d271d 100644 --- a/src/modules/partition/core/KPMHelpers.cpp +++ b/src/modules/partition/core/KPMHelpers.cpp @@ -128,7 +128,7 @@ clonePartition( Device* device, Partition* partition ) } Calamares::JobResult -execute( Operation& operation, const QString& failureMessage ) +execute( Operation&& operation, const QString& failureMessage ) { operation.setStatus( Operation::StatusRunning ); diff --git a/src/modules/partition/core/KPMHelpers.h b/src/modules/partition/core/KPMHelpers.h index 1d40dd363..fe4d24f14 100644 --- a/src/modules/partition/core/KPMHelpers.h +++ b/src/modules/partition/core/KPMHelpers.h @@ -80,7 +80,7 @@ Partition* clonePartition( Device* device, Partition* partition ); * Otherwise returns an error using @p failureMessage as the primary part * of the error, and details obtained from the operation. */ -Calamares::JobResult execute( Operation& operation, const QString& failureMessage ); +Calamares::JobResult execute( Operation&& operation, const QString& failureMessage ); } // namespace KPMHelpers diff --git a/src/modules/partition/jobs/CreatePartitionJob.cpp b/src/modules/partition/jobs/CreatePartitionJob.cpp index 248104226..fe7c6f350 100644 --- a/src/modules/partition/jobs/CreatePartitionJob.cpp +++ b/src/modules/partition/jobs/CreatePartitionJob.cpp @@ -275,9 +275,9 @@ CreatePartitionJob::exec() return createZfs( m_partition, m_device ); } - NewOperation op( *m_device, m_partition ); return KPMHelpers::execute( - op, tr( "The installer failed to create partition on disk '%1'." ).arg( m_device->name() ) ); + NewOperation( *m_device, m_partition ), + tr( "The installer failed to create partition on disk '%1'." ).arg( m_device->name() ) ); } void diff --git a/src/modules/partition/jobs/DeletePartitionJob.cpp b/src/modules/partition/jobs/DeletePartitionJob.cpp index e573d1d3c..d61bb955e 100644 --- a/src/modules/partition/jobs/DeletePartitionJob.cpp +++ b/src/modules/partition/jobs/DeletePartitionJob.cpp @@ -98,8 +98,7 @@ DeletePartitionJob::exec() return removePartition( m_partition ); } - DeleteOperation op( *m_device, m_partition ); - return KPMHelpers::execute( op, + return KPMHelpers::execute( DeleteOperation( *m_device, m_partition ), tr( "The installer failed to delete partition %1." ).arg( m_partition->devicePath() ) ); } From b8ce21d572f39c0622749c079e7d6125fd7e9ef3 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 11 Dec 2021 23:03:26 +0100 Subject: [PATCH 86/99] [partition] Use convenience function for running operations --- .../jobs/CreatePartitionTableJob.cpp | 17 +++++------------ .../partition/jobs/CreateVolumeGroupJob.cpp | 18 ++++-------------- .../partition/jobs/FormatPartitionJob.cpp | 18 +++++------------- .../partition/jobs/RemoveVolumeGroupJob.cpp | 18 +++++------------- .../partition/jobs/ResizeVolumeGroupJob.cpp | 19 +++++-------------- 5 files changed, 24 insertions(+), 66 deletions(-) diff --git a/src/modules/partition/jobs/CreatePartitionTableJob.cpp b/src/modules/partition/jobs/CreatePartitionTableJob.cpp index 118ec8823..3908ccc81 100644 --- a/src/modules/partition/jobs/CreatePartitionTableJob.cpp +++ b/src/modules/partition/jobs/CreatePartitionTableJob.cpp @@ -14,7 +14,8 @@ #include "partition/PartitionIterator.h" #include "utils/Logger.h" -// KPMcore +#include "core/KPMHelpers.h" + #include #include #include @@ -63,8 +64,6 @@ CreatePartitionTableJob::prettyStatusMessage() const Calamares::JobResult CreatePartitionTableJob::exec() { - Report report( nullptr ); - QString message = tr( "The installer failed to create a partition table on %1." ).arg( m_device->name() ); PartitionTable* table = m_device->partitionTable(); @@ -91,15 +90,9 @@ CreatePartitionTableJob::exec() cDebug() << Logger::SubEntry << "mount output:\n" << Logger::NoQuote << mount.readAllStandardOutput(); } - CreatePartitionTableOperation op( *m_device, table ); - op.setStatus( Operation::StatusRunning ); - - if ( op.execute( report ) ) - { - return Calamares::JobResult::ok(); - } - - return Calamares::JobResult::error( message, report.toText() ); + return KPMHelpers::execute( + CreatePartitionTableOperation( *m_device, table ), + tr( "The installer failed to create a partition table on %1." ).arg( m_device->name() ) ); } void diff --git a/src/modules/partition/jobs/CreateVolumeGroupJob.cpp b/src/modules/partition/jobs/CreateVolumeGroupJob.cpp index 36d79b7b7..683913b7f 100644 --- a/src/modules/partition/jobs/CreateVolumeGroupJob.cpp +++ b/src/modules/partition/jobs/CreateVolumeGroupJob.cpp @@ -9,7 +9,8 @@ #include "CreateVolumeGroupJob.h" -// KPMcore +#include "core/KPMHelpers.h" + #include #include #include @@ -46,19 +47,8 @@ CreateVolumeGroupJob::prettyStatusMessage() const Calamares::JobResult CreateVolumeGroupJob::exec() { - Report report( nullptr ); - - CreateVolumeGroupOperation op( m_vgName, m_pvList, m_peSize ); - - op.setStatus( Operation::StatusRunning ); - - QString message = tr( "The installer failed to create a volume group named '%1'." ).arg( m_vgName ); - if ( op.execute( report ) ) - { - return Calamares::JobResult::ok(); - } - - return Calamares::JobResult::error( message, report.toText() ); + return KPMHelpers::execute( CreateVolumeGroupOperation( m_vgName, m_pvList, m_peSize ), + tr( "The installer failed to create a volume group named '%1'." ).arg( m_vgName ) ); } void diff --git a/src/modules/partition/jobs/FormatPartitionJob.cpp b/src/modules/partition/jobs/FormatPartitionJob.cpp index 4dadacf9c..1ccc6e617 100644 --- a/src/modules/partition/jobs/FormatPartitionJob.cpp +++ b/src/modules/partition/jobs/FormatPartitionJob.cpp @@ -11,6 +11,8 @@ #include "FormatPartitionJob.h" +#include "core/KPMHelpers.h" + #include "partition/FileSystem.h" #include "utils/Logger.h" @@ -65,17 +67,7 @@ FormatPartitionJob::prettyStatusMessage() const Calamares::JobResult FormatPartitionJob::exec() { - Report report( nullptr ); // Root of the report tree, no parent - CreateFileSystemOperation op( *m_device, *m_partition, m_partition->fileSystem().type() ); - op.setStatus( Operation::StatusRunning ); - - QString message = tr( "The installer failed to format partition %1 on disk '%2'." ) - .arg( m_partition->partitionPath(), m_device->name() ); - - if ( op.execute( report ) ) - { - return Calamares::JobResult::ok(); - } - - return Calamares::JobResult::error( message, report.toText() ); + return KPMHelpers::execute( CreateFileSystemOperation( *m_device, *m_partition, m_partition->fileSystem().type() ), + tr( "The installer failed to format partition %1 on disk '%2'." ) + .arg( m_partition->partitionPath(), m_device->name() ) ); } diff --git a/src/modules/partition/jobs/RemoveVolumeGroupJob.cpp b/src/modules/partition/jobs/RemoveVolumeGroupJob.cpp index 3c4e7b036..227351064 100644 --- a/src/modules/partition/jobs/RemoveVolumeGroupJob.cpp +++ b/src/modules/partition/jobs/RemoveVolumeGroupJob.cpp @@ -9,6 +9,8 @@ #include "RemoveVolumeGroupJob.h" +#include "core/KPMHelpers.h" + #include #include #include @@ -39,17 +41,7 @@ RemoveVolumeGroupJob::prettyStatusMessage() const Calamares::JobResult RemoveVolumeGroupJob::exec() { - Report report( nullptr ); - - RemoveVolumeGroupOperation op( *m_device ); - - op.setStatus( Operation::OperationStatus::StatusRunning ); - - QString message = tr( "The installer failed to remove a volume group named '%1'." ).arg( m_device->name() ); - if ( op.execute( report ) ) - { - return Calamares::JobResult::ok(); - } - - return Calamares::JobResult::error( message, report.toText() ); + return KPMHelpers::execute( + RemoveVolumeGroupOperation( *m_device ), + tr( "The installer failed to remove a volume group named '%1'." ).arg( m_device->name() ) ); } diff --git a/src/modules/partition/jobs/ResizeVolumeGroupJob.cpp b/src/modules/partition/jobs/ResizeVolumeGroupJob.cpp index 1aa4541b8..f7a21d80d 100644 --- a/src/modules/partition/jobs/ResizeVolumeGroupJob.cpp +++ b/src/modules/partition/jobs/ResizeVolumeGroupJob.cpp @@ -9,7 +9,8 @@ #include "ResizeVolumeGroupJob.h" -// KPMcore +#include "core/KPMHelpers.h" + #include #include #include @@ -51,19 +52,9 @@ ResizeVolumeGroupJob::prettyStatusMessage() const Calamares::JobResult ResizeVolumeGroupJob::exec() { - Report report( nullptr ); - - ResizeVolumeGroupOperation op( *m_device, m_partitionList ); - - op.setStatus( Operation::OperationStatus::StatusRunning ); - - QString message = tr( "The installer failed to resize a volume group named '%1'." ).arg( m_device->name() ); - if ( op.execute( report ) ) - { - return Calamares::JobResult::ok(); - } - - return Calamares::JobResult::error( message, report.toText() ); + return KPMHelpers::execute( + ResizeVolumeGroupOperation( *m_device, m_partitionList ), + tr( "The installer failed to resize a volume group named '%1'." ).arg( m_device->name() ) ); } QString From c5573a1997a2cb92f2bfccbe8fdf7ddc568d1ee5 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 11 Dec 2021 23:19:01 +0100 Subject: [PATCH 87/99] [partition] Add non-const lvalue overload for execute() --- src/modules/partition/core/KPMHelpers.cpp | 2 +- src/modules/partition/core/KPMHelpers.h | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/modules/partition/core/KPMHelpers.cpp b/src/modules/partition/core/KPMHelpers.cpp index f836d271d..46efeb392 100644 --- a/src/modules/partition/core/KPMHelpers.cpp +++ b/src/modules/partition/core/KPMHelpers.cpp @@ -128,7 +128,7 @@ clonePartition( Device* device, Partition* partition ) } Calamares::JobResult -execute( Operation&& operation, const QString& failureMessage ) +execute( Operation& operation, const QString& failureMessage ) { operation.setStatus( Operation::StatusRunning ); diff --git a/src/modules/partition/core/KPMHelpers.h b/src/modules/partition/core/KPMHelpers.h index fe4d24f14..2f867bc25 100644 --- a/src/modules/partition/core/KPMHelpers.h +++ b/src/modules/partition/core/KPMHelpers.h @@ -80,7 +80,17 @@ Partition* clonePartition( Device* device, Partition* partition ); * Otherwise returns an error using @p failureMessage as the primary part * of the error, and details obtained from the operation. */ -Calamares::JobResult execute( Operation&& operation, const QString& failureMessage ); +Calamares::JobResult execute( Operation& operation, const QString& failureMessage ); +/** @brief Return a result for an @p operation + * + * It's acceptable to use an rvalue: the operation-running is the effect + * you're interested in, rather than keeping the temporary around. + */ +static inline Calamares::JobResult +execute( Operation&& operation, const QString& failureMessage ) +{ + return execute( operation, failureMessage ); +} } // namespace KPMHelpers From 668058472404a183eb535f83a2724a5f9c369377 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 11 Dec 2021 23:25:21 +0100 Subject: [PATCH 88/99] [partition] Use convenience function execute() This job needs the lvalue-overload of execute() because it needs to call a method on the operation after execute() finishes successfully. --- .../partition/jobs/DeactivateVolumeGroupJob.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp b/src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp index 92086015d..65920a84e 100644 --- a/src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp +++ b/src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp @@ -9,6 +9,8 @@ #include "DeactivateVolumeGroupJob.h" +#include "core/KPMHelpers.h" + #include #include #include @@ -39,18 +41,12 @@ DeactivateVolumeGroupJob::prettyStatusMessage() const Calamares::JobResult DeactivateVolumeGroupJob::exec() { - Report report( nullptr ); - DeactivateVolumeGroupOperation op( *m_device ); - - op.setStatus( Operation::OperationStatus::StatusRunning ); - - QString message = tr( "The installer failed to deactivate a volume group named %1." ).arg( m_device->name() ); - if ( op.execute( report ) ) + auto r = KPMHelpers::execute( + op, tr( "The installer failed to deactivate a volume group named %1." ).arg( m_device->name() ) ); + if ( r ) { op.preview(); - return Calamares::JobResult::ok(); } - - return Calamares::JobResult::error( message, report.toText() ); + return r; } From fdf0f208f08de8d39c7f24ca7b406006bb5c686a Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 11 Dec 2021 23:26:12 +0100 Subject: [PATCH 89/99] [partition] Use lvalue-overload of execute() convenience - These jobs may take a long time, and report progress; we need the operation around to be able to connect the signals and slots --- .../partition/jobs/ResizePartitionJob.cpp | 20 +++++++------------ .../partition/jobs/SetPartitionFlagsJob.cpp | 15 ++++---------- 2 files changed, 11 insertions(+), 24 deletions(-) diff --git a/src/modules/partition/jobs/ResizePartitionJob.cpp b/src/modules/partition/jobs/ResizePartitionJob.cpp index 87b87c1c0..fe1ceca4c 100644 --- a/src/modules/partition/jobs/ResizePartitionJob.cpp +++ b/src/modules/partition/jobs/ResizePartitionJob.cpp @@ -11,9 +11,10 @@ #include "ResizePartitionJob.h" +#include "core/KPMHelpers.h" + #include "utils/Units.h" -// KPMcore #include #include #include @@ -66,23 +67,16 @@ ResizePartitionJob::prettyStatusMessage() const Calamares::JobResult ResizePartitionJob::exec() { - Report report( nullptr ); // Restore partition sectors that were modified for preview m_partition->setFirstSector( m_oldFirstSector ); m_partition->setLastSector( m_oldLastSector ); + ResizeOperation op( *m_device, *m_partition, m_newFirstSector, m_newLastSector ); - op.setStatus( Operation::StatusRunning ); connect( &op, &Operation::progress, this, &ResizePartitionJob::iprogress ); - - QString errorMessage = tr( "The installer failed to resize partition %1 on disk '%2'." ) - .arg( m_partition->partitionPath() ) - .arg( m_device->name() ); - if ( op.execute( report ) ) - { - return Calamares::JobResult::ok(); - } - - return Calamares::JobResult::error( errorMessage, report.toText() ); + return KPMHelpers::execute( op, + tr( "The installer failed to resize partition %1 on disk '%2'." ) + .arg( m_partition->partitionPath() ) + .arg( m_device->name() ) ); } void diff --git a/src/modules/partition/jobs/SetPartitionFlagsJob.cpp b/src/modules/partition/jobs/SetPartitionFlagsJob.cpp index de77d86f8..507773288 100644 --- a/src/modules/partition/jobs/SetPartitionFlagsJob.cpp +++ b/src/modules/partition/jobs/SetPartitionFlagsJob.cpp @@ -13,6 +13,8 @@ #include "SetPartitionFlagsJob.h" +#include "core/KPMHelpers.h" + #include "partition/FileSystem.h" #include "utils/Logger.h" #include "utils/Units.h" @@ -148,17 +150,8 @@ SetPartFlagsJob::exec() cDebug() << "Setting flags on" << m_device->deviceNode() << "partition" << partition()->deviceNode() << Logger::DebugList( flagsList ); - Report report( nullptr ); SetPartFlagsOperation op( *m_device, *partition(), m_flags ); - op.setStatus( Operation::StatusRunning ); connect( &op, &Operation::progress, this, &SetPartFlagsJob::iprogress ); - - QString errorMessage - = tr( "The installer failed to set flags on partition %1." ).arg( m_partition->partitionPath() ); - if ( op.execute( report ) ) - { - return Calamares::JobResult::ok(); - } - - return Calamares::JobResult::error( errorMessage, report.toText() ); + return KPMHelpers::execute( + op, tr( "The installer failed to set flags on partition %1." ).arg( m_partition->partitionPath() ) ); } From 07354a26a99b73f8c5ce542992361928b9adc158 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 11 Dec 2021 23:35:34 +0100 Subject: [PATCH 90/99] [partition] Simplify debug calls to executables - Use the Calamares support-functions for running lsblk and mount (these might need to have privilege support if Cala is not running as root, so this is future-proofing) --- .../partition/jobs/CreatePartitionTableJob.cpp | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/modules/partition/jobs/CreatePartitionTableJob.cpp b/src/modules/partition/jobs/CreatePartitionTableJob.cpp index 3908ccc81..3b9415d1a 100644 --- a/src/modules/partition/jobs/CreatePartitionTableJob.cpp +++ b/src/modules/partition/jobs/CreatePartitionTableJob.cpp @@ -12,6 +12,7 @@ #include "CreatePartitionTableJob.h" #include "partition/PartitionIterator.h" +#include "utils/CalamaresUtilsSystem.h" #include "utils/Logger.h" #include "core/KPMHelpers.h" @@ -75,19 +76,11 @@ CreatePartitionTableJob::exec() cDebug() << Logger::SubEntry << ( ( *it ) ? ( *it )->deviceNode() : QString( "" ) ); } - QProcess lsblk; - lsblk.setProgram( "lsblk" ); - lsblk.setProcessChannelMode( QProcess::MergedChannels ); - lsblk.start(); - lsblk.waitForFinished(); - cDebug() << Logger::SubEntry << "lsblk output:\n" << Logger::NoQuote << lsblk.readAllStandardOutput(); + auto lsblkResult = CalamaresUtils::System::runCommand( { "lsblk" }, std::chrono::seconds( 30 ) ); + cDebug() << Logger::SubEntry << "lsblk output:\n" << Logger::NoQuote << lsblkResult.getOutput(); - QProcess mount; - mount.setProgram( "mount" ); // Debug output only, not mounting something - mount.setProcessChannelMode( QProcess::MergedChannels ); - mount.start(); - mount.waitForFinished(); - cDebug() << Logger::SubEntry << "mount output:\n" << Logger::NoQuote << mount.readAllStandardOutput(); + auto mountResult = CalamaresUtils::System::runCommand( { "mount" }, std::chrono::seconds( 30 ) ); + cDebug() << Logger::SubEntry << "mount output:\n" << Logger::NoQuote << mountResult.getOutput(); } return KPMHelpers::execute( From f04394d0147fab83b92923bb490723eba82625ab Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 11 Dec 2021 23:44:23 +0100 Subject: [PATCH 91/99] [partition] Improve rendering of KPMCore errors --- src/modules/partition/core/KPMHelpers.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/modules/partition/core/KPMHelpers.cpp b/src/modules/partition/core/KPMHelpers.cpp index 46efeb392..d5086ef21 100644 --- a/src/modules/partition/core/KPMHelpers.cpp +++ b/src/modules/partition/core/KPMHelpers.cpp @@ -15,8 +15,8 @@ #include "partition/PartitionIterator.h" #include "utils/Logger.h" +#include "utils/String.h" -// KPMcore #include #include #include @@ -138,7 +138,11 @@ execute( Operation& operation, const QString& failureMessage ) return Calamares::JobResult::ok(); } - return Calamares::JobResult::error( failureMessage, report.toText() ); + // Remove the === lines from the report by trimming them to empty + QStringList l = report.toText().split( '\n' ); + std::for_each( l.begin(), l.end(), []( QString& s ) { CalamaresUtils::removeLeading( s, '=' ); } ); + + return Calamares::JobResult::error( failureMessage, l.join( '\n' ) ); } From 587a18a6fae7a34edd4a95ad79f69ad21dc8d1a7 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 14 Dec 2021 12:50:27 +0100 Subject: [PATCH 92/99] [partition] Use runCommand() for future-proofing --- src/modules/partition/core/DeviceList.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/modules/partition/core/DeviceList.cpp b/src/modules/partition/core/DeviceList.cpp index c7de12e88..423c3b4ee 100644 --- a/src/modules/partition/core/DeviceList.cpp +++ b/src/modules/partition/core/DeviceList.cpp @@ -11,6 +11,7 @@ #include "DeviceList.h" #include "partition/PartitionIterator.h" +#include "utils/CalamaresUtilsSystem.h" #include "utils/Logger.h" #include @@ -43,11 +44,9 @@ hasRootPartition( Device* device ) static bool blkIdCheckIso9660( const QString& path ) { - QProcess blkid; - blkid.start( "blkid", { path } ); - blkid.waitForFinished(); - QString output = QString::fromLocal8Bit( blkid.readAllStandardOutput() ); - return output.contains( "iso9660" ); + // If blkid fails, there's no output, but we don't care + auto r = CalamaresUtils::System::runCommand( { "blkid", path }, std::chrono::seconds( 30 ) ); + return r.getOutput().contains( "iso9660" ); } static bool From be18e51bc967b12c7659b65ed0f4760452ee9524 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Sat, 18 Dec 2021 00:38:06 +0100 Subject: [PATCH 93/99] i18n: [calamares] Automatic merge of Transifex translations --- lang/calamares_en_GB.ts | 2 +- lang/calamares_hi.ts | 10 +- lang/calamares_id.ts | 68 +- lang/calamares_ro.ts | 2 +- lang/calamares_ta_IN.ts | 4377 +++++++++++++++++++++++++++++++++++++++ lang/calamares_vi.ts | 12 +- 6 files changed, 4424 insertions(+), 47 deletions(-) create mode 100644 lang/calamares_ta_IN.ts diff --git a/lang/calamares_en_GB.ts b/lang/calamares_en_GB.ts index 3578d4554..b8ddc023f 100644 --- a/lang/calamares_en_GB.ts +++ b/lang/calamares_en_GB.ts @@ -1989,7 +1989,7 @@ The installer will quit and all changes will be lost. Configuration Error - + Configuration Error diff --git a/lang/calamares_hi.ts b/lang/calamares_hi.ts index 7f20e8bcd..16eee77b5 100644 --- a/lang/calamares_hi.ts +++ b/lang/calamares_hi.ts @@ -689,27 +689,27 @@ The installer will quit and all changes will be lost. Successfully unmounted %1. - + %1 को माउंट से हटाना सफल। Successfully disabled swap %1. - + %1 स्वैप निष्क्रिय करना सफल। Successfully cleared swap %1. - + %1 स्वैप रिक्त करना सफल। Successfully closed mapper device %1. - + प्रतिचित्रण उपकरण %1 बंद करना सफल। Successfully disabled volume group %1. - + वॉल्यूम समूह %1 निष्क्रिय करना सफल। diff --git a/lang/calamares_id.ts b/lang/calamares_id.ts index d3a29ac42..a8b1d4cbf 100644 --- a/lang/calamares_id.ts +++ b/lang/calamares_id.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + Kelola pengaturan mount otomatis @@ -114,12 +114,12 @@ Uploads the session log to the configured pastebin. - + Unggah catatan sesi ke pastebin yang telah dikonfigurasi. Send Session Log - + Kirim Catatan Sesi @@ -165,7 +165,7 @@ Programmed job failure was explicitly requested. - + Kegagalan pekerjaan diprogram diminta secara eksplisit. @@ -189,7 +189,7 @@ Run command '%1' in target system. - Jalankan perintah '%1' di dalam sistem target. + Jalankan perintah '%1' pada sistem target. @@ -245,7 +245,7 @@ QML Step <i>%1</i>. - + QML Langkah <i>%1</i>. @@ -277,7 +277,7 @@ System-requirements checking is complete. - + Pengecekan kebutuhan sistem telah selesai. @@ -295,7 +295,7 @@ Would you like to paste the install log to the web? - Maukah anda untuk menempelkan log instalasi ke situs? + Maukah anda menempelkan log instalasi ke situs? @@ -429,7 +429,7 @@ Link copied to clipboard &Done - &Kelar + &Selesai @@ -1054,12 +1054,12 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. Label for the filesystem - + Label untuk filesystem FS Label: - + Label FS: @@ -1418,12 +1418,12 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. Label for the filesystem - + Label untuk filesystem FS Label: - + Label FS: @@ -1582,7 +1582,7 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. Format partition %1 (file system: %2, size: %3 MiB) on %4. - + Format partisi %1 (file system: %2, ukuran %3 MiB) pada %4. @@ -1645,12 +1645,12 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. is running the installer as an administrator (root) - + menjalankan installer sebagai administrator (root) The setup program is not running with administrator rights. - + Installer tidak dijalankan dengan kewenangan administrator. @@ -1699,7 +1699,7 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. Could not open file <code>%1</code>. - + Tidak dapat membuka berkas <code>%1</code>. @@ -1712,7 +1712,7 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. Creating initramfs with mkinitcpio. - + Membuat initramfs menggunakan mkinitcpio. @@ -1720,7 +1720,7 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. Creating initramfs. - + Membuat initramfs. @@ -2031,12 +2031,12 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. Browser software - Peramban perangkat lunak + Perangkat lunak peramban Browser package - Peramban paket + Paket peramban @@ -2046,12 +2046,12 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. Kernel - Inti + Kernel Services - Jasa + Servis @@ -2587,12 +2587,12 @@ Instalasi dapat dilanjutkan, namun beberapa fitur akan dinonfungsikan. Repeat Password - + Ulangi Kata Sandi When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Ketikan kotak ini dicentang, pengecekan kekuatan kata sandi akan dilakukan dan anda tidak akan dapat menggunakan kata sandi yang lemah. @@ -4252,7 +4252,7 @@ Keluaran: root is not allowed as username. - + root tidak boleh digunakan sebagai nama pengguna. @@ -4287,7 +4287,7 @@ Keluaran: Repeat Password - + Ulangi Kata Sandi @@ -4297,27 +4297,27 @@ Keluaran: Validate passwords quality - + Validasi kualitas kata sandi When this box is checked, password-strength checking is done and you will not be able to use a weak password. - + Ketikan kotak ini dicentang, pengecekan kekuatan kata sandi akan dilakukan dan anda tidak akan dapat menggunakan kata sandi yang lemah. Log in automatically without asking for the password - + Masuk ke dalam sesi secara otomatis tanpa menanyakan kata sandi Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. - + Hanya huruf, angka, garis bawah, dan tanda hubung yang diperbolehkan, minimal dua karakter. Reuse user password as root password - + Gunakan kata sandi pengguna sebagai kata sandi root @@ -4332,12 +4332,12 @@ Keluaran: Root Password - + Kata Sandi Root Repeat Root Password - + Ulangi Kata Sandi diff --git a/lang/calamares_ro.ts b/lang/calamares_ro.ts index a6872e55b..39573886d 100644 --- a/lang/calamares_ro.ts +++ b/lang/calamares_ro.ts @@ -1991,7 +1991,7 @@ Programul de instalare va ieși, iar toate modificările vor fi pierdute. Configuration Error - + Eroare de configurare diff --git a/lang/calamares_ta_IN.ts b/lang/calamares_ta_IN.ts new file mode 100644 index 000000000..165321f17 --- /dev/null +++ b/lang/calamares_ta_IN.ts @@ -0,0 +1,4377 @@ + + + + + AutoMountManagementJob + + + Manage auto-mount settings + + + + + BootInfoWidget + + + The <strong>boot environment</strong> of this system.<br><br>Older x86 systems only support <strong>BIOS</strong>.<br>Modern systems usually use <strong>EFI</strong>, but may also show up as BIOS if started in compatibility mode. + + + + + This system was started with an <strong>EFI</strong> boot environment.<br><br>To configure startup from an EFI environment, this installer must deploy a boot loader application, like <strong>GRUB</strong> or <strong>systemd-boot</strong> on an <strong>EFI System Partition</strong>. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own. + + + + + This system was started with a <strong>BIOS</strong> boot environment.<br><br>To configure startup from a BIOS environment, this installer must install a boot loader, like <strong>GRUB</strong>, either at the beginning of a partition or on the <strong>Master Boot Record</strong> near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own. + + + + + BootLoaderModel + + + Master Boot Record of %1 + + + + + Boot Partition + இயக்கப் பகுதிப்பிரிப்பு + + + + System Partition + + + + + Do not install a boot loader + + + + + %1 (%2) + + + + + Calamares::BlankViewStep + + + Blank Page + + + + + Calamares::DebugWindow + + + Form + + + + + GlobalStorage + + + + + JobQueue + + + + + Modules + + + + + Type: + + + + + + none + + + + + Interface: + + + + + Crashes Calamares, so that Dr. Konqui can look at it. + + + + + Reloads the stylesheet from the branding directory. + + + + + Uploads the session log to the configured pastebin. + + + + + Send Session Log + + + + + Reload Stylesheet + + + + + Displays the tree of widget names in the log (for stylesheet debugging). + + + + + Widget Tree + + + + + Debug information + + + + + Calamares::ExecutionViewStep + + + Set up + + + + + Install + + + + + Calamares::FailJob + + + Job failed (%1) + + + + + Programmed job failure was explicitly requested. + + + + + Calamares::JobThread + + + Done + + + + + Calamares::NamedJob + + + Example job (%1) + + + + + Calamares::ProcessJob + + + Run command '%1' in target system. + + + + + Run command '%1'. + + + + + Running command %1 %2 + + + + + Calamares::PythonJob + + + Running %1 operation. + + + + + Bad working directory path + + + + + Working directory %1 for python job %2 is not readable. + + + + + Bad main script file + + + + + Main script file %1 for python job %2 is not readable. + + + + + Boost.Python error in job "%1". + + + + + Calamares::QmlViewStep + + + Loading ... + + + + + QML Step <i>%1</i>. + + + + + Loading failed. + + + + + Calamares::RequirementsChecker + + + Requirements checking for module <i>%1</i> is complete. + + + + + Waiting for %n module(s). + + + + + + + + (%n second(s)) + + + + + + + + System-requirements checking is complete. + + + + + Calamares::ViewManager + + + Setup Failed + + + + + Installation Failed + + + + + Would you like to paste the install log to the web? + + + + + Error + + + + + &Yes + + + + + &No + + + + + &Close + + + + + Install Log Paste URL + + + + + The upload was unsuccessful. No web-paste was done. + + + + + Install log posted to + +%1 + +Link copied to clipboard + + + + + Calamares Initialization Failed + + + + + %1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution. + + + + + <br/>The following modules could not be loaded: + + + + + Continue with setup? + + + + + Continue with installation? + + + + + The %1 setup program is about to make changes to your disk in order to set up %2.<br/><strong>You will not be able to undo these changes.</strong> + + + + + The %1 installer is about to make changes to your disk in order to install %2.<br/><strong>You will not be able to undo these changes.</strong> + + + + + &Set up now + + + + + &Install now + + + + + Go &back + + + + + &Set up + + + + + &Install + + + + + Setup is complete. Close the setup program. + + + + + The installation is complete. Close the installer. + + + + + Cancel setup without changing the system. + + + + + Cancel installation without changing the system. + + + + + &Next + + + + + &Back + + + + + &Done + + + + + &Cancel + + + + + Cancel setup? + + + + + Cancel installation? + + + + + Do you really want to cancel the current setup process? +The setup program will quit and all changes will be lost. + + + + + Do you really want to cancel the current install process? +The installer will quit and all changes will be lost. + + + + + CalamaresPython::Helper + + + Unknown exception type + + + + + unparseable Python error + + + + + unparseable Python traceback + + + + + Unfetchable Python error. + + + + + CalamaresWindow + + + %1 Setup Program + + + + + %1 Installer + + + + + ChangeFilesystemLabelJob + + + Set filesystem label on %1. + + + + + Set filesystem label <strong>%1</strong> to partition <strong>%2</strong>. + + + + + The installer failed to update partition table on disk '%1'. + + + + + CheckerContainer + + + Gathering system information... + + + + + ChoicePage + + + Form + + + + + Select storage de&vice: + + + + + + + + Current: + + + + + After: + + + + + <strong>Manual partitioning</strong><br/>You can create or resize partitions yourself. + + + + + Reuse %1 as home partition for %2. + + + + + <strong>Select a partition to shrink, then drag the bottom bar to resize</strong> + + + + + %1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4. + + + + + Boot loader location: + + + + + <strong>Select a partition to install on</strong> + + + + + An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. + + + + + The EFI system partition at %1 will be used for starting %2. + + + + + EFI system partition: + + + + + This storage device does not seem to have an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. + + + + + + + + <strong>Erase disk</strong><br/>This will <font color="red">delete</font> all data currently present on the selected storage device. + + + + + + + + <strong>Install alongside</strong><br/>The installer will shrink a partition to make room for %1. + + + + + + + + <strong>Replace a partition</strong><br/>Replaces a partition with %1. + + + + + This storage device has %1 on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. + + + + + This storage device already has an operating system on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. + + + + + This storage device has multiple operating systems on it. What would you like to do?<br/>You will be able to review and confirm your choices before any change is made to the storage device. + + + + + This storage device already has an operating system on it, but the partition table <strong>%1</strong> is different from the needed <strong>%2</strong>.<br/> + + + + + This storage device has one of its partitions <strong>mounted</strong>. + + + + + This storage device is a part of an <strong>inactive RAID</strong> device. + + + + + No Swap + + + + + Reuse Swap + + + + + Swap (no Hibernate) + + + + + Swap (with Hibernate) + + + + + Swap to file + + + + + ClearMountsJob + + + Successfully unmounted %1. + + + + + Successfully disabled swap %1. + + + + + Successfully cleared swap %1. + + + + + Successfully closed mapper device %1. + + + + + Successfully disabled volume group %1. + + + + + Clear mounts for partitioning operations on %1 + + + + + Clearing mounts for partitioning operations on %1. + + + + + Cleared all mounts for %1 + + + + + ClearTempMountsJob + + + Clear all temporary mounts. + + + + + Clearing all temporary mounts. + + + + + Cannot get list of temporary mounts. + + + + + Cleared all temporary mounts. + + + + + CommandList + + + + Could not run command. + + + + + The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined. + + + + + The command needs to know the user's name, but no username is defined. + + + + + Config + + + Set keyboard model to %1.<br/> + + + + + Set keyboard layout to %1/%2. + + + + + Set timezone to %1/%2. + + + + + The system language will be set to %1. + + + + + The numbers and dates locale will be set to %1. + + + + + Network Installation. (Disabled: Incorrect configuration) + + + + + Network Installation. (Disabled: Received invalid groups data) + + + + + Network Installation. (Disabled: Internal error) + + + + + Network Installation. (Disabled: No package list) + + + + + Package selection + + + + + Network Installation. (Disabled: Unable to fetch package lists, check your network connection) + + + + + This computer does not satisfy the minimum requirements for setting up %1.<br/>Setup cannot continue. <a href="#details">Details...</a> + + + + + This computer does not satisfy the minimum requirements for installing %1.<br/>Installation cannot continue. <a href="#details">Details...</a> + + + + + This computer does not satisfy some of the recommended requirements for setting up %1.<br/>Setup can continue, but some features might be disabled. + + + + + This computer does not satisfy some of the recommended requirements for installing %1.<br/>Installation can continue, but some features might be disabled. + + + + + This program will ask you some questions and set up %2 on your computer. + + + + + <h1>Welcome to the Calamares setup program for %1</h1> + + + + + <h1>Welcome to %1 setup</h1> + + + + + <h1>Welcome to the Calamares installer for %1</h1> + + + + + <h1>Welcome to the %1 installer</h1> + + + + + Your username is too long. + + + + + '%1' is not allowed as username. + + + + + Your username must start with a lowercase letter or underscore. + + + + + Only lowercase letters, numbers, underscore and hyphen are allowed. + + + + + Your hostname is too short. + + + + + Your hostname is too long. + + + + + '%1' is not allowed as hostname. + + + + + Only letters, numbers, underscore and hyphen are allowed. + + + + + Your passwords do not match! + + + + + OK! + + + + + Setup Failed + + + + + Installation Failed + + + + + The setup of %1 did not complete successfully. + + + + + The installation of %1 did not complete successfully. + + + + + Setup Complete + + + + + Installation Complete + + + + + The setup of %1 is complete. + + + + + The installation of %1 is complete. + + + + + Package Selection + + + + + Please pick a product from the list. The selected product will be installed. + + + + + Install option: <strong>%1</strong> + + + + + None + + + + + Summary + + + + + This is an overview of what will happen once you start the setup procedure. + + + + + This is an overview of what will happen once you start the install procedure. + + + + + ContextualProcessJob + + + Contextual Processes Job + + + + + CreatePartitionDialog + + + Create a Partition + + + + + Si&ze: + + + + + MiB + + + + + Partition &Type: + + + + + &Primary + + + + + E&xtended + + + + + Fi&le System: + + + + + LVM LV name + + + + + &Mount Point: + + + + + Flags: + + + + + Label for the filesystem + + + + + FS Label: + + + + + En&crypt + + + + + Logical + + + + + Primary + + + + + GPT + + + + + Mountpoint already in use. Please select another one. + + + + + CreatePartitionJob + + + Create new %1MiB partition on %3 (%2) with entries %4. + + + + + Create new %1MiB partition on %3 (%2). + + + + + Create new %2MiB partition on %4 (%3) with file system %1. + + + + + Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2) with entries <em>%4</em>. + + + + + Create new <strong>%1MiB</strong> partition on <strong>%3</strong> (%2). + + + + + Create new <strong>%2MiB</strong> partition on <strong>%4</strong> (%3) with file system <strong>%1</strong>. + + + + + + Creating new %1 partition on %2. + + + + + The installer failed to create partition on disk '%1'. + + + + + CreatePartitionTableDialog + + + Create Partition Table + + + + + Creating a new partition table will delete all existing data on the disk. + + + + + What kind of partition table do you want to create? + + + + + Master Boot Record (MBR) + + + + + GUID Partition Table (GPT) + + + + + CreatePartitionTableJob + + + Create new %1 partition table on %2. + + + + + Create new <strong>%1</strong> partition table on <strong>%2</strong> (%3). + + + + + Creating new %1 partition table on %2. + + + + + The installer failed to create a partition table on %1. + + + + + CreateUserJob + + + Create user %1 + + + + + Create user <strong>%1</strong>. + + + + + Preserving home directory + + + + + + Creating user %1 + + + + + Configuring user %1 + + + + + Setting file permissions + + + + + CreateVolumeGroupDialog + + + Create Volume Group + + + + + CreateVolumeGroupJob + + + Create new volume group named %1. + + + + + Create new volume group named <strong>%1</strong>. + + + + + Creating new volume group named %1. + + + + + The installer failed to create a volume group named '%1'. + + + + + DeactivateVolumeGroupJob + + + + Deactivate volume group named %1. + + + + + Deactivate volume group named <strong>%1</strong>. + + + + + The installer failed to deactivate a volume group named %1. + + + + + DeletePartitionJob + + + Delete partition %1. + + + + + Delete partition <strong>%1</strong>. + + + + + Deleting partition %1. + + + + + The installer failed to delete partition %1. + + + + + DeviceInfoWidget + + + This device has a <strong>%1</strong> partition table. + + + + + This is a <strong>loop</strong> device.<br><br>It is a pseudo-device with no partition table that makes a file accessible as a block device. This kind of setup usually only contains a single filesystem. + + + + + This installer <strong>cannot detect a partition table</strong> on the selected storage device.<br><br>The device either has no partition table, or the partition table is corrupted or of an unknown type.<br>This installer can create a new partition table for you, either automatically, or through the manual partitioning page. + + + + + <br><br>This is the recommended partition table type for modern systems which start from an <strong>EFI</strong> boot environment. + + + + + <br><br>This partition table type is only advisable on older systems which start from a <strong>BIOS</strong> boot environment. GPT is recommended in most other cases.<br><br><strong>Warning:</strong> the MBR partition table is an obsolete MS-DOS era standard.<br>Only 4 <em>primary</em> partitions may be created, and of those 4, one can be an <em>extended</em> partition, which may in turn contain many <em>logical</em> partitions. + + + + + The type of <strong>partition table</strong> on the selected storage device.<br><br>The only way to change the partition table type is to erase and recreate the partition table from scratch, which destroys all data on the storage device.<br>This installer will keep the current partition table unless you explicitly choose otherwise.<br>If unsure, on modern systems GPT is preferred. + + + + + DeviceModel + + + %1 - %2 (%3) + device[name] - size[number] (device-node[name]) + + + + + %1 - (%2) + device[name] - (device-node[name]) + + + + + DracutLuksCfgJob + + + Write LUKS configuration for Dracut to %1 + + + + + Skip writing LUKS configuration for Dracut: "/" partition is not encrypted + + + + + Failed to open %1 + + + + + DummyCppJob + + + Dummy C++ Job + + + + + EditExistingPartitionDialog + + + Edit Existing Partition + + + + + Content: + + + + + &Keep + + + + + Format + + + + + Warning: Formatting the partition will erase all existing data. + + + + + &Mount Point: + + + + + Si&ze: + + + + + MiB + + + + + Fi&le System: + + + + + Flags: + + + + + Label for the filesystem + + + + + FS Label: + + + + + Mountpoint already in use. Please select another one. + + + + + EncryptWidget + + + Form + + + + + En&crypt system + + + + + Passphrase + + + + + Confirm passphrase + + + + + + Please enter the same passphrase in both boxes. + + + + + FillGlobalStorageJob + + + Set partition information + + + + + Install %1 on <strong>new</strong> %2 system partition with features <em>%3</em> + + + + + Install %1 on <strong>new</strong> %2 system partition. + + + + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong> and features <em>%3</em>. + + + + + Set up <strong>new</strong> %2 partition with mount point <strong>%1</strong>%3. + + + + + Install %2 on %3 system partition <strong>%1</strong> with features <em>%4</em>. + + + + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong> and features <em>%4</em>. + + + + + Set up %3 partition <strong>%1</strong> with mount point <strong>%2</strong>%4. + + + + + Install %2 on %3 system partition <strong>%1</strong>. + + + + + Install boot loader on <strong>%1</strong>. + + + + + Setting up mount points. + + + + + FinishedPage + + + Form + + + + + &Restart now + + + + + <h1>All done.</h1><br/>%1 has been set up on your computer.<br/>You may now start using your new system. + + + + + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the setup program.</p></body></html> + + + + + <h1>All done.</h1><br/>%1 has been installed on your computer.<br/>You may now restart into your new system, or continue using the %2 Live environment. + + + + + <html><head/><body><p>When this box is checked, your system will restart immediately when you click on <span style="font-style:italic;">Done</span> or close the installer.</p></body></html> + + + + + <h1>Setup Failed</h1><br/>%1 has not been set up on your computer.<br/>The error message was: %2. + + + + + <h1>Installation Failed</h1><br/>%1 has not been installed on your computer.<br/>The error message was: %2. + + + + + FinishedQmlViewStep + + + Finish + + + + + FinishedViewStep + + + Finish + + + + + FormatPartitionJob + + + Format partition %1 (file system: %2, size: %3 MiB) on %4. + + + + + Format <strong>%3MiB</strong> partition <strong>%1</strong> with file system <strong>%2</strong>. + + + + + Formatting partition %1 with file system %2. + + + + + The installer failed to format partition %1 on disk '%2'. + + + + + GeneralRequirements + + + has at least %1 GiB available drive space + + + + + There is not enough drive space. At least %1 GiB is required. + + + + + has at least %1 GiB working memory + + + + + The system does not have enough working memory. At least %1 GiB is required. + + + + + is plugged in to a power source + + + + + The system is not plugged in to a power source. + + + + + is connected to the Internet + + + + + The system is not connected to the Internet. + + + + + is running the installer as an administrator (root) + + + + + The setup program is not running with administrator rights. + + + + + The installer is not running with administrator rights. + + + + + has a screen large enough to show the whole installer + + + + + The screen is too small to display the setup program. + + + + + The screen is too small to display the installer. + + + + + HostInfoJob + + + Collecting information about your machine. + + + + + IDJob + + + + + + OEM Batch Identifier + + + + + Could not create directories <code>%1</code>. + + + + + Could not open file <code>%1</code>. + + + + + Could not write to file <code>%1</code>. + + + + + InitcpioJob + + + Creating initramfs with mkinitcpio. + + + + + InitramfsJob + + + Creating initramfs. + + + + + InteractiveTerminalPage + + + Konsole not installed + + + + + Please install KDE Konsole and try again! + + + + + Executing script: &nbsp;<code>%1</code> + + + + + InteractiveTerminalViewStep + + + Script + + + + + KeyboardQmlViewStep + + + Keyboard + + + + + KeyboardViewStep + + + Keyboard + + + + + LCLocaleDialog + + + System locale setting + + + + + The system locale setting affects the language and character set for some command line user interface elements.<br/>The current setting is <strong>%1</strong>. + + + + + &Cancel + + + + + &OK + + + + + LicensePage + + + Form + + + + + <h1>License Agreement</h1> + + + + + I accept the terms and conditions above. + + + + + Please review the End User License Agreements (EULAs). + + + + + This setup procedure will install proprietary software that is subject to licensing terms. + + + + + If you do not agree with the terms, the setup procedure cannot continue. + + + + + This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience. + + + + + If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead. + + + + + LicenseViewStep + + + License + + + + + LicenseWidget + + + URL: %1 + + + + + <strong>%1 driver</strong><br/>by %2 + %1 is an untranslatable product name, example: Creative Audigy driver + + + + + <strong>%1 graphics driver</strong><br/><font color="Grey">by %2</font> + %1 is usually a vendor name, example: Nvidia graphics driver + + + + + <strong>%1 browser plugin</strong><br/><font color="Grey">by %2</font> + + + + + <strong>%1 codec</strong><br/><font color="Grey">by %2</font> + + + + + <strong>%1 package</strong><br/><font color="Grey">by %2</font> + + + + + <strong>%1</strong><br/><font color="Grey">by %2</font> + + + + + File: %1 + + + + + Hide license text + + + + + Show the license text + + + + + Open license agreement in browser. + + + + + LocalePage + + + Region: + + + + + Zone: + + + + + + &Change... + + + + + LocaleQmlViewStep + + + Location + + + + + LocaleTests + + + Quit + + + + + LocaleViewStep + + + Location + + + + + LuksBootKeyFileJob + + + Configuring LUKS key file. + + + + + + No partitions are defined. + + + + + + + Encrypted rootfs setup error + + + + + Root partition %1 is LUKS but no passphrase has been set. + + + + + Could not create LUKS key file for root partition %1. + + + + + Could not configure LUKS key file on partition %1. + + + + + MachineIdJob + + + Generate machine-id. + + + + + Configuration Error + + + + + No root mount point is set for MachineId. + + + + + Map + + + Timezone: %1 + + + + + Please select your preferred location on the map so the installer can suggest the locale + and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging + to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming. + + + + + NetInstallViewStep + + + Package selection + + + + + Office software + + + + + Office package + + + + + Browser software + + + + + Browser package + + + + + Web browser + + + + + Kernel + + + + + Services + + + + + Login + + + + + Desktop + + + + + Applications + + + + + Communication + + + + + Development + + + + + Office + + + + + Multimedia + + + + + Internet + + + + + Theming + + + + + Gaming + + + + + Utilities + + + + + NotesQmlViewStep + + + Notes + + + + + OEMPage + + + Ba&tch: + + + + + <html><head/><body><p>Enter a batch-identifier here. This will be stored in the target system.</p></body></html> + + + + + <html><head/><body><h1>OEM Configuration</h1><p>Calamares will use OEM settings while configuring the target system.</p></body></html> + + + + + OEMViewStep + + + OEM Configuration + + + + + Set the OEM Batch Identifier to <code>%1</code>. + + + + + Offline + + + Select your preferred Region, or use the default settings. + + + + + + + Timezone: %1 + + + + + Select your preferred Zone within your Region. + + + + + Zones + + + + + You can fine-tune Language and Locale settings below. + + + + + PWQ + + + Password is too short + + + + + Password is too long + + + + + Password is too weak + + + + + Memory allocation error when setting '%1' + + + + + Memory allocation error + + + + + The password is the same as the old one + + + + + The password is a palindrome + + + + + The password differs with case changes only + + + + + The password is too similar to the old one + + + + + The password contains the user name in some form + + + + + The password contains words from the real name of the user in some form + + + + + The password contains forbidden words in some form + + + + + The password contains too few digits + + + + + The password contains too few uppercase letters + + + + + The password contains fewer than %n lowercase letters + + + + + + + + The password contains too few lowercase letters + + + + + The password contains too few non-alphanumeric characters + + + + + The password is too short + + + + + The password does not contain enough character classes + + + + + The password contains too many same characters consecutively + + + + + The password contains too many characters of the same class consecutively + + + + + The password contains fewer than %n digits + + + + + + + + The password contains fewer than %n uppercase letters + + + + + + + + The password contains fewer than %n non-alphanumeric characters + + + + + + + + The password is shorter than %n characters + + + + + + + + The password is a rotated version of the previous one + + + + + The password contains fewer than %n character classes + + + + + + + + The password contains more than %n same characters consecutively + + + + + + + + The password contains more than %n characters of the same class consecutively + + + + + + + + The password contains monotonic sequence longer than %n characters + + + + + + + + The password contains too long of a monotonic character sequence + + + + + No password supplied + + + + + Cannot obtain random numbers from the RNG device + + + + + Password generation failed - required entropy too low for settings + + + + + The password fails the dictionary check - %1 + + + + + The password fails the dictionary check + + + + + Unknown setting - %1 + + + + + Unknown setting + + + + + Bad integer value of setting - %1 + + + + + Bad integer value + + + + + Setting %1 is not of integer type + + + + + Setting is not of integer type + + + + + Setting %1 is not of string type + + + + + Setting is not of string type + + + + + Opening the configuration file failed + + + + + The configuration file is malformed + + + + + Fatal failure + + + + + Unknown error + + + + + Password is empty + + + + + PackageChooserPage + + + Form + + + + + Product Name + + + + + TextLabel + + + + + Long Product Description + + + + + Package Selection + + + + + Please pick a product from the list. The selected product will be installed. + + + + + PackageChooserQmlViewStep + + + Packages + + + + + PackageChooserViewStep + + + Packages + + + + + PackageModel + + + Name + + + + + Description + + + + + Page_Keyboard + + + Form + + + + + Keyboard Model: + + + + + Type here to test your keyboard + + + + + Page_UserSetup + + + Form + + + + + What is your name? + + + + + Your Full Name + + + + + What name do you want to use to log in? + + + + + login + + + + + What is the name of this computer? + + + + + <small>This name will be used if you make the computer visible to others on a network.</small> + + + + + Computer Name + + + + + Choose a password to keep your account safe. + + + + + + <small>Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals.</small> + + + + + + Password + + + + + + Repeat Password + + + + + When this box is checked, password-strength checking is done and you will not be able to use a weak password. + + + + + Require strong passwords. + + + + + Log in automatically without asking for the password. + + + + + Use the same password for the administrator account. + + + + + Choose a password for the administrator account. + + + + + + <small>Enter the same password twice, so that it can be checked for typing errors.</small> + + + + + PartitionLabelsView + + + Root + + + + + Home + + + + + Boot + + + + + EFI system + + + + + Swap + + + + + New partition for %1 + + + + + New partition + + + + + %1 %2 + size[number] filesystem[name] + + + + + PartitionModel + + + + Free Space + + + + + + New partition + + + + + Name + + + + + File System + + + + + File System Label + + + + + Mount Point + + + + + Size + + + + + PartitionPage + + + Form + + + + + Storage de&vice: + + + + + &Revert All Changes + + + + + New Partition &Table + + + + + Cre&ate + + + + + &Edit + + + + + &Delete + + + + + New Volume Group + + + + + Resize Volume Group + + + + + Deactivate Volume Group + + + + + Remove Volume Group + + + + + I&nstall boot loader on: + + + + + Are you sure you want to create a new partition table on %1? + + + + + Can not create new partition + + + + + The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead. + + + + + PartitionViewStep + + + Gathering system information... + + + + + Partitions + + + + + Current: + + + + + After: + + + + + No EFI system partition configured + + + + + EFI system partition configured incorrectly + + + + + An EFI system partition is necessary to start %1.<br/><br/>To configure an EFI system partition, go back and select or create a suitable filesystem. + + + + + The filesystem must be mounted on <strong>%1</strong>. + + + + + The filesystem must have type FAT32. + + + + + The filesystem must be at least %1 MiB in size. + + + + + The filesystem must have flag <strong>%1</strong> set. + + + + + You can continue without setting up an EFI system partition but your system may fail to start. + + + + + Option to use GPT on BIOS + + + + + A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.<br/><br/>To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the <strong>bios_grub</strong> flag enabled.<br/><br/>An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT. + + + + + Boot partition not encrypted + + + + + A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.<br/><br/>There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.<br/>You may continue if you wish, but filesystem unlocking will happen later during system startup.<br/>To encrypt the boot partition, go back and recreate it, selecting <strong>Encrypt</strong> in the partition creation window. + + + + + has at least one disk device available. + + + + + There are no partitions to install on. + + + + + PlasmaLnfJob + + + Plasma Look-and-Feel Job + + + + + + Could not select KDE Plasma Look-and-Feel package + + + + + PlasmaLnfPage + + + Form + + + + + Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. + + + + + Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is installed. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel. + + + + + PlasmaLnfViewStep + + + Look-and-Feel + + + + + PreserveFiles + + + Saving files for later ... + + + + + No files configured to save for later. + + + + + Not all of the configured files could be preserved. + + + + + ProcessResult + + + +There was no output from the command. + + + + + +Output: + + + + + + External command crashed. + + + + + Command <i>%1</i> crashed. + + + + + External command failed to start. + + + + + Command <i>%1</i> failed to start. + + + + + Internal error when starting command. + + + + + Bad parameters for process job call. + + + + + External command failed to finish. + + + + + Command <i>%1</i> failed to finish in %2 seconds. + + + + + External command finished with errors. + + + + + Command <i>%1</i> finished with exit code %2. + + + + + QObject + + + %1 (%2) + + + + + unknown + + + + + extended + + + + + unformatted + + + + + swap + + + + + + Default + + + + + + + + File not found + + + + + Path <pre>%1</pre> must be an absolute path. + + + + + Directory not found + + + + + + Could not create new random file <pre>%1</pre>. + + + + + No product + + + + + No description provided. + + + + + (no mount point) + + + + + Unpartitioned space or unknown partition table + + + + + Recommended + + + <p>This computer does not satisfy some of the recommended requirements for setting up %1.<br/> + Setup can continue, but some features might be disabled.</p> + + + + + RemoveUserJob + + + Remove live user from target system + + + + + RemoveVolumeGroupJob + + + + Remove Volume Group named %1. + + + + + Remove Volume Group named <strong>%1</strong>. + + + + + The installer failed to remove a volume group named '%1'. + + + + + ReplaceWidget + + + Form + + + + + Select where to install %1.<br/><font color="red">Warning: </font>this will delete all files on the selected partition. + + + + + The selected item does not appear to be a valid partition. + + + + + %1 cannot be installed on empty space. Please select an existing partition. + + + + + %1 cannot be installed on an extended partition. Please select an existing primary or logical partition. + + + + + %1 cannot be installed on this partition. + + + + + Data partition (%1) + + + + + Unknown system partition (%1) + + + + + %1 system partition (%2) + + + + + <strong>%4</strong><br/><br/>The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB. + + + + + <strong>%2</strong><br/><br/>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1. + + + + + + + <strong>%3</strong><br/><br/>%1 will be installed on %2.<br/><font color="red">Warning: </font>all data on partition %2 will be lost. + + + + + The EFI system partition at %1 will be used for starting %2. + + + + + EFI system partition: + + + + + Requirements + + + <p>This computer does not satisfy the minimum requirements for installing %1.<br/> + Installation cannot continue.</p> + + + + + <p>This computer does not satisfy some of the recommended requirements for setting up %1.<br/> + Setup can continue, but some features might be disabled.</p> + + + + + ResizeFSJob + + + Resize Filesystem Job + + + + + Invalid configuration + + + + + The file-system resize job has an invalid configuration and will not run. + + + + + KPMCore not Available + + + + + Calamares cannot start KPMCore for the file-system resize job. + + + + + + + + + Resize Failed + + + + + The filesystem %1 could not be found in this system, and cannot be resized. + + + + + The device %1 could not be found in this system, and cannot be resized. + + + + + + The filesystem %1 cannot be resized. + + + + + + The device %1 cannot be resized. + + + + + The filesystem %1 must be resized, but cannot. + + + + + The device %1 must be resized, but cannot + + + + + ResizePartitionJob + + + Resize partition %1. + + + + + Resize <strong>%2MiB</strong> partition <strong>%1</strong> to <strong>%3MiB</strong>. + + + + + Resizing %2MiB partition %1 to %3MiB. + + + + + The installer failed to resize partition %1 on disk '%2'. + + + + + ResizeVolumeGroupDialog + + + Resize Volume Group + + + + + ResizeVolumeGroupJob + + + + Resize volume group named %1 from %2 to %3. + + + + + Resize volume group named <strong>%1</strong> from <strong>%2</strong> to <strong>%3</strong>. + + + + + The installer failed to resize a volume group named '%1'. + + + + + ResultsListDialog + + + For best results, please ensure that this computer: + + + + + System requirements + + + + + ScanningDialog + + + Scanning storage devices... + + + + + Partitioning + + + + + SetHostNameJob + + + Set hostname %1 + + + + + Set hostname <strong>%1</strong>. + + + + + Setting hostname %1. + + + + + + Internal Error + + + + + + Cannot write hostname to target system + + + + + SetKeyboardLayoutJob + + + Set keyboard model to %1, layout to %2-%3 + + + + + Failed to write keyboard configuration for the virtual console. + + + + + + + Failed to write to %1 + + + + + Failed to write keyboard configuration for X11. + + + + + Failed to write keyboard configuration to existing /etc/default directory. + + + + + SetPartFlagsJob + + + Set flags on partition %1. + + + + + Set flags on %1MiB %2 partition. + + + + + Set flags on new partition. + + + + + Clear flags on partition <strong>%1</strong>. + + + + + Clear flags on %1MiB <strong>%2</strong> partition. + + + + + Clear flags on new partition. + + + + + Flag partition <strong>%1</strong> as <strong>%2</strong>. + + + + + Flag %1MiB <strong>%2</strong> partition as <strong>%3</strong>. + + + + + Flag new partition as <strong>%1</strong>. + + + + + Clearing flags on partition <strong>%1</strong>. + + + + + Clearing flags on %1MiB <strong>%2</strong> partition. + + + + + Clearing flags on new partition. + + + + + Setting flags <strong>%2</strong> on partition <strong>%1</strong>. + + + + + Setting flags <strong>%3</strong> on %1MiB <strong>%2</strong> partition. + + + + + Setting flags <strong>%1</strong> on new partition. + + + + + The installer failed to set flags on partition %1. + + + + + SetPasswordJob + + + Set password for user %1 + + + + + Setting password for user %1. + + + + + Bad destination system path. + + + + + rootMountPoint is %1 + + + + + Cannot disable root account. + + + + + passwd terminated with error code %1. + + + + + Cannot set password for user %1. + + + + + usermod terminated with error code %1. + + + + + SetTimezoneJob + + + Set timezone to %1/%2 + + + + + Cannot access selected timezone path. + + + + + Bad path: %1 + + + + + Cannot set timezone. + + + + + Link creation failed, target: %1; link name: %2 + + + + + Cannot set timezone, + + + + + Cannot open /etc/timezone for writing + + + + + SetupGroupsJob + + + Preparing groups. + + + + + + Could not create groups in target system + + + + + These groups are missing in the target system: %1 + + + + + SetupSudoJob + + + Configure <pre>sudo</pre> users. + + + + + Cannot chmod sudoers file. + + + + + Cannot create sudoers file for writing. + + + + + ShellProcessJob + + + Shell Processes Job + + + + + SlideCounter + + + %L1 / %L2 + slide counter, %1 of %2 (numeric) + + + + + StandardButtons + + + &OK + + + + + &Yes + + + + + &No + + + + + &Cancel + + + + + &Close + + + + + TrackingInstallJob + + + Installation feedback + + + + + Sending installation feedback. + + + + + Internal error in install-tracking. + + + + + HTTP request timed out. + + + + + TrackingKUserFeedbackJob + + + KDE user feedback + + + + + Configuring KDE user feedback. + + + + + + Error in KDE user feedback configuration. + + + + + Could not configure KDE user feedback correctly, script error %1. + + + + + Could not configure KDE user feedback correctly, Calamares error %1. + + + + + TrackingMachineUpdateManagerJob + + + Machine feedback + + + + + Configuring machine feedback. + + + + + + Error in machine feedback configuration. + + + + + Could not configure machine feedback correctly, script error %1. + + + + + Could not configure machine feedback correctly, Calamares error %1. + + + + + TrackingPage + + + Form + + + + + Placeholder + + + + + <html><head/><body><p>Click here to send <span style=" font-weight:600;">no information at all</span> about your installation.</p></body></html> + + + + + <html><head/><body><p><a href="placeholder"><span style=" text-decoration: underline; color:#2980b9;">Click here for more information about user feedback</span></a></p></body></html> + + + + + Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area. + + + + + By selecting this you will send information about your installation and hardware. This information will only be sent <b>once</b> after the installation finishes. + + + + + By selecting this you will periodically send information about your <b>machine</b> installation, hardware and applications, to %1. + + + + + By selecting this you will regularly send information about your <b>user</b> installation, hardware, applications and application usage patterns, to %1. + + + + + TrackingViewStep + + + Feedback + + + + + UsersPage + + + <small>If more than one person will use this computer, you can create multiple accounts after setup.</small> + + + + + <small>If more than one person will use this computer, you can create multiple accounts after installation.</small> + + + + + UsersQmlViewStep + + + Users + + + + + UsersViewStep + + + Users + + + + + VariantModel + + + Key + Column header for key/value + + + + + Value + Column header for key/value + + + + + VolumeGroupBaseDialog + + + Create Volume Group + + + + + List of Physical Volumes + + + + + Volume Group Name: + + + + + Volume Group Type: + + + + + Physical Extent Size: + + + + + MiB + + + + + Total Size: + + + + + Used Size: + + + + + Total Sectors: + + + + + Quantity of LVs: + + + + + WelcomePage + + + Form + + + + + + Select application and system language + + + + + &About + + + + + Open donations website + + + + + &Donate + + + + + Open help and support website + + + + + &Support + + + + + Open issues and bug-tracking website + + + + + &Known issues + + + + + Open release notes website + + + + + &Release notes + + + + + <h1>Welcome to the Calamares setup program for %1.</h1> + + + + + <h1>Welcome to %1 setup.</h1> + + + + + <h1>Welcome to the Calamares installer for %1.</h1> + + + + + <h1>Welcome to the %1 installer.</h1> + + + + + %1 support + + + + + About %1 setup + + + + + About %1 installer + + + + + <h1>%1</h1><br/><strong>%2<br/>for %3</strong><br/><br/>Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/>Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/>Thanks to <a href="https://calamares.io/team/">the Calamares team</a> and the <a href="https://www.transifex.com/calamares/calamares/">Calamares translators team</a>.<br/><br/><a href="https://calamares.io/">Calamares</a> development is sponsored by <br/><a href="http://www.blue-systems.com/">Blue Systems</a> - Liberating Software. + + + + + WelcomeQmlViewStep + + + Welcome + + + + + WelcomeViewStep + + + Welcome + + + + + about + + + <h1>%1</h1><br/> + <strong>%2<br/> + for %3</strong><br/><br/> + Copyright 2014-2017 Teo Mrnjavac &lt;teo@kde.org&gt;<br/> + Copyright 2017-2020 Adriaan de Groot &lt;groot@kde.org&gt;<br/> + Thanks to <a href='https://calamares.io/team/'>the Calamares team</a> + and the <a href='https://www.transifex.com/calamares/calamares/'>Calamares + translators team</a>.<br/><br/> + <a href='https://calamares.io/'>Calamares</a> + development is sponsored by <br/> + <a href='http://www.blue-systems.com/'>Blue Systems</a> - + Liberating Software. + + + + + Back + + + + + calamares-sidebar + + + Show debug information + + + + + finishedq + + + Installation Completed + + + + + %1 has been installed on your computer.<br/> + You may now restart into your new system, or continue using the Live environment. + + + + + Close Installer + + + + + Restart System + + + + + <p>A full log of the install is available as installation.log in the home directory of the Live user.<br/> + This log is copied to /var/log/installation.log of the target system.</p> + + + + + i18n + + + <h1>Languages</h1> </br> + The system locale setting affects the language and character set for some command line user interface elements. The current setting is <strong>%1</strong>. + + + + + <h1>Locales</h1> </br> + The system locale setting affects the numbers and dates format. The current setting is <strong>%1</strong>. + + + + + Back + + + + + keyboardq + + + To activate keyboard preview, select a layout. + + + + + Keyboard Model: + + + + + Layouts + + + + + Type here to test your keyboard + + + + + Variants + + + + + localeq + + + Change + + + + + notesqml + + + <h3>%1</h3> + <p>These are example release notes.</p> + + + + + packagechooserq + + + LibreOffice is a powerful and free office suite, used by millions of people around the world. It includes several applications that make it the most versatile Free and Open Source office suite on the market.<br/> + Default option. + + + + + LibreOffice + + + + + If you don't want to install an office suite, just select No Office Suite. You can always add one (or more) later on your installed system as the need arrives. + + + + + No Office Suite + + + + + Create a minimal Desktop install, remove all extra applications and decide later on what you would like to add to your system. Examples of what won't be on such an install, there will be no Office Suite, no media players, no image viewer or print support. It will be just a desktop, file browser, package manager, text editor and simple web-browser. + + + + + Minimal Install + + + + + Please select an option for your install, or use the default: LibreOffice included. + + + + + release_notes + + + <h3>%1</h3> + <p>This an example QML file, showing options in RichText with Flickable content.</p> + + <p>QML with RichText can use HTML tags, Flickable content is useful for touchscreens.</p> + + <p><b>This is bold text</b></p> + <p><i>This is italic text</i></p> + <p><u>This is underlined text</u></p> + <p><center>This text will be center-aligned.</center></p> + <p><s>This is strikethrough</s></p> + + <p>Code example: + <code>ls -l /home</code></p> + + <p><b>Lists:</b></p> + <ul> + <li>Intel CPU systems</li> + <li>AMD CPU systems</li> + </ul> + + <p>The vertical scrollbar is adjustable, current width set to 10.</p> + + + + + Back + + + + + usersq + + + Pick your user name and credentials to login and perform admin tasks + + + + + What is your name? + + + + + Your Full Name + + + + + What name do you want to use to log in? + + + + + Login Name + + + + + If more than one person will use this computer, you can create multiple accounts after installation. + + + + + Only lowercase letters, numbers, underscore and hyphen are allowed. + + + + + root is not allowed as username. + + + + + What is the name of this computer? + + + + + Computer Name + + + + + This name will be used if you make the computer visible to others on a network. + + + + + localhost is not allowed as hostname. + + + + + Choose a password to keep your account safe. + + + + + Password + + + + + Repeat Password + + + + + Enter the same password twice, so that it can be checked for typing errors. A good password will contain a mixture of letters, numbers and punctuation, should be at least eight characters long, and should be changed at regular intervals. + + + + + Validate passwords quality + + + + + When this box is checked, password-strength checking is done and you will not be able to use a weak password. + + + + + Log in automatically without asking for the password + + + + + Only letters, numbers, underscore and hyphen are allowed, minimal of two characters. + + + + + Reuse user password as root password + + + + + Use the same password for the administrator account. + + + + + Choose a root password to keep your account safe. + + + + + Root Password + + + + + Repeat Root Password + + + + + Enter the same password twice, so that it can be checked for typing errors. + + + + + welcomeq + + + <h3>Welcome to the %1 <quote>%2</quote> installer</h3> + <p>This program will ask you some questions and set up %1 on your computer.</p> + + + + + About + + + + + Support + + + + + Known issues + + + + + Release notes + + + + + Donate + + + + diff --git a/lang/calamares_vi.ts b/lang/calamares_vi.ts index 9e59b527d..14d93dade 100644 --- a/lang/calamares_vi.ts +++ b/lang/calamares_vi.ts @@ -6,7 +6,7 @@ Manage auto-mount settings - + Quản lý cài đặt tự động gắn kết(auto-mount) @@ -104,22 +104,22 @@ Crashes Calamares, so that Dr. Konqui can look at it. - + Gây crash Calamares, để Dr. Konqui có thể xem nó. Reloads the stylesheet from the branding directory. - + Tải lại stylesheet từ thư mục branding Uploads the session log to the configured pastebin. - + Đăng tải log của phiên này lên pastebin đã được cấu hình Send Session Log - + Gửi log của phiên này @@ -129,7 +129,7 @@ Displays the tree of widget names in the log (for stylesheet debugging). - + Hiễn thị cây của tên widget trong log(để gỡ lỗi stylesheet) From cfeba736d5042a2ac7177037e77c1fc10956b598 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Sat, 18 Dec 2021 00:38:13 +0100 Subject: [PATCH 94/99] i18n: [python] Automatic merge of Transifex translations --- lang/python/en_GB/LC_MESSAGES/python.po | 17 +- lang/python/hi/LC_MESSAGES/python.po | 4 +- lang/python/pl/LC_MESSAGES/python.po | 2 +- lang/python/ro/LC_MESSAGES/python.po | 11 +- lang/python/ta_IN/LC_MESSAGES/python.po | 387 ++++++++++++++++++++++++ lang/python/vi/LC_MESSAGES/python.po | 4 +- 6 files changed, 408 insertions(+), 17 deletions(-) create mode 100644 lang/python/ta_IN/LC_MESSAGES/python.po diff --git a/lang/python/en_GB/LC_MESSAGES/python.po b/lang/python/en_GB/LC_MESSAGES/python.po index 34fcd2d7a..c2d93d0f8 100644 --- a/lang/python/en_GB/LC_MESSAGES/python.po +++ b/lang/python/en_GB/LC_MESSAGES/python.po @@ -5,6 +5,7 @@ # # Translators: # Jason Collins , 2018 +# Karthik Balan, 2021 # #, fuzzy msgid "" @@ -13,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-11-02 15:45+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Jason Collins , 2018\n" +"Last-Translator: Karthik Balan, 2021\n" "Language-Team: English (United Kingdom) (https://www.transifex.com/calamares/teams/20061/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -35,7 +36,7 @@ msgstr "" #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 msgid "Configuration Error" -msgstr "" +msgstr "Configuration Error " #: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356 #: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145 @@ -61,7 +62,7 @@ msgstr "" #: src/modules/bootloader/main.py:508 msgid "Bootloader installation error" -msgstr "" +msgstr "Bootloader installation error" #: src/modules/bootloader/main.py:509 msgid "" @@ -91,7 +92,7 @@ msgstr "" #: src/modules/displaymanager/main.py:526 msgid "Cannot write KDM configuration file" -msgstr "" +msgstr "Cannot write KDM configuration file" #: src/modules/displaymanager/main.py:527 msgid "KDM config file {!s} does not exist" @@ -145,7 +146,7 @@ msgstr "" #: src/modules/services-openrc/main.py:29 msgid "Configure OpenRC services" -msgstr "" +msgstr "Configure OpenRC services" #: src/modules/services-openrc/main.py:57 msgid "Cannot add service {name!s} to run-level {level!s}." @@ -173,7 +174,7 @@ msgstr "" #: src/modules/services-openrc/main.py:101 msgid "Target runlevel does not exist" -msgstr "" +msgstr "Target runlevel does not exist" #: src/modules/services-openrc/main.py:102 msgid "" @@ -193,7 +194,7 @@ msgstr "" #: src/modules/networkcfg/main.py:29 msgid "Saving network configuration." -msgstr "" +msgstr "Saving network configuration " #: src/modules/packages/main.py:50 src/modules/packages/main.py:59 #: src/modules/packages/main.py:69 @@ -222,7 +223,7 @@ msgstr[1] "Removing %(num)d packages." #: src/modules/packages/main.py:638 src/modules/packages/main.py:650 #: src/modules/packages/main.py:678 msgid "Package Manager error" -msgstr "" +msgstr "Package Manager error" #: src/modules/packages/main.py:639 msgid "" diff --git a/lang/python/hi/LC_MESSAGES/python.po b/lang/python/hi/LC_MESSAGES/python.po index c80f08842..00914664c 100644 --- a/lang/python/hi/LC_MESSAGES/python.po +++ b/lang/python/hi/LC_MESSAGES/python.po @@ -319,7 +319,7 @@ msgstr "systemd लक्ष्य {name!s}सक्रिय क #: src/modules/services-systemd/main.py:67 msgid "Cannot enable systemd timer {name!s}." -msgstr "" +msgstr "systemd टाइमर {name!s}सक्रिय करना विफल।" #: src/modules/services-systemd/main.py:71 msgid "Cannot disable systemd target {name!s}." @@ -399,6 +399,8 @@ msgid "" "Failed to find unsquashfs, make sure you have the squashfs-tools package " "installed." msgstr "" +"unsqaushfs खोजने में विफल, सुनिश्चित करें कि squashfs-tools पैकेज इंस्टॉल " +"है।" #: src/modules/unpackfs/main.py:479 msgid "The destination \"{}\" in the target system is not a directory" diff --git a/lang/python/pl/LC_MESSAGES/python.po b/lang/python/pl/LC_MESSAGES/python.po index ea9756e2b..7d4100a03 100644 --- a/lang/python/pl/LC_MESSAGES/python.po +++ b/lang/python/pl/LC_MESSAGES/python.po @@ -4,7 +4,7 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Marcin Mikołajczak , 2017 +# marcin mikołajczak , 2017 # KagiSame, 2018 # Piotr Strębski , 2020 # Jacob B. , 2021 diff --git a/lang/python/ro/LC_MESSAGES/python.po b/lang/python/ro/LC_MESSAGES/python.po index ab6e35e7f..91be0dd5a 100644 --- a/lang/python/ro/LC_MESSAGES/python.po +++ b/lang/python/ro/LC_MESSAGES/python.po @@ -6,6 +6,7 @@ # Translators: # Jobava Jobava , 2018 # Sebastian Brici , 2018 +# Chele Ion , 2021 # #, fuzzy msgid "" @@ -14,7 +15,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-11-02 15:45+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Sebastian Brici , 2018\n" +"Last-Translator: Chele Ion , 2021\n" "Language-Team: Romanian (https://www.transifex.com/calamares/teams/20061/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,7 +25,7 @@ msgstr "" #: src/modules/initramfscfg/main.py:32 msgid "Configuring initramfs." -msgstr "" +msgstr "Configurare initramfs" #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 #: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361 @@ -36,21 +37,21 @@ msgstr "" #: src/modules/luksopenswaphookcfg/main.py:86 #: src/modules/luksopenswaphookcfg/main.py:90 msgid "Configuration Error" -msgstr "" +msgstr "Eroare de configurare" #: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356 #: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145 #: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73 #: src/modules/luksopenswaphookcfg/main.py:87 msgid "No partitions are defined for 
{!s}
to use." -msgstr "" +msgstr "Nu sunt partiţii definite ca 1{!s}1 ." #: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362 #: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232 #: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77 #: src/modules/luksopenswaphookcfg/main.py:91 msgid "No root mount point is given for 
{!s}
to use." -msgstr "" +msgstr "Nu este definită o partiţie rădăcină pentru 1{!s}1 ." #: src/modules/grubcfg/main.py:28 msgid "Configure GRUB." diff --git a/lang/python/ta_IN/LC_MESSAGES/python.po b/lang/python/ta_IN/LC_MESSAGES/python.po new file mode 100644 index 000000000..666703faf --- /dev/null +++ b/lang/python/ta_IN/LC_MESSAGES/python.po @@ -0,0 +1,387 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-11-02 15:45+0100\n" +"PO-Revision-Date: 2017-08-09 10:34+0000\n" +"Language-Team: Tamil (India) (https://www.transifex.com/calamares/teams/20061/ta_IN/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ta_IN\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: src/modules/initramfscfg/main.py:32 +msgid "Configuring initramfs." +msgstr "" + +#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89 +#: src/modules/fstab/main.py:355 src/modules/fstab/main.py:361 +#: src/modules/fstab/main.py:388 src/modules/networkcfg/main.py:105 +#: src/modules/initcpiocfg/main.py:227 src/modules/initcpiocfg/main.py:231 +#: src/modules/localecfg/main.py:135 src/modules/mount/main.py:144 +#: src/modules/rawfs/main.py:164 src/modules/openrcdmcryptcfg/main.py:72 +#: src/modules/openrcdmcryptcfg/main.py:76 +#: src/modules/luksopenswaphookcfg/main.py:86 +#: src/modules/luksopenswaphookcfg/main.py:90 +msgid "Configuration Error" +msgstr "" + +#: src/modules/initramfscfg/main.py:86 src/modules/fstab/main.py:356 +#: src/modules/initcpiocfg/main.py:228 src/modules/mount/main.py:145 +#: src/modules/rawfs/main.py:165 src/modules/openrcdmcryptcfg/main.py:73 +#: src/modules/luksopenswaphookcfg/main.py:87 +msgid "No partitions are defined for 
{!s}
to use." +msgstr "" + +#: src/modules/initramfscfg/main.py:90 src/modules/fstab/main.py:362 +#: src/modules/networkcfg/main.py:106 src/modules/initcpiocfg/main.py:232 +#: src/modules/localecfg/main.py:136 src/modules/openrcdmcryptcfg/main.py:77 +#: src/modules/luksopenswaphookcfg/main.py:91 +msgid "No root mount point is given for 
{!s}
to use." +msgstr "" + +#: src/modules/grubcfg/main.py:28 +msgid "Configure GRUB." +msgstr "" + +#: src/modules/bootloader/main.py:43 +msgid "Install bootloader." +msgstr "" + +#: src/modules/bootloader/main.py:508 +msgid "Bootloader installation error" +msgstr "" + +#: src/modules/bootloader/main.py:509 +msgid "" +"The bootloader could not be installed. The installation command " +"
{!s}
returned error code {!s}." +msgstr "" + +#: src/modules/fstab/main.py:29 +msgid "Writing fstab." +msgstr "" + +#: src/modules/fstab/main.py:389 +msgid "No 
{!s}
configuration is given for 
{!s}
to use." +msgstr "" + +#: src/modules/dracut/main.py:27 +msgid "Creating initramfs with dracut." +msgstr "" + +#: src/modules/dracut/main.py:49 +msgid "Failed to run dracut on the target" +msgstr "" + +#: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50 +msgid "The exit code was {}" +msgstr "" + +#: src/modules/displaymanager/main.py:526 +msgid "Cannot write KDM configuration file" +msgstr "" + +#: src/modules/displaymanager/main.py:527 +msgid "KDM config file {!s} does not exist" +msgstr "" + +#: src/modules/displaymanager/main.py:588 +msgid "Cannot write LXDM configuration file" +msgstr "" + +#: src/modules/displaymanager/main.py:589 +msgid "LXDM config file {!s} does not exist" +msgstr "" + +#: src/modules/displaymanager/main.py:672 +msgid "Cannot write LightDM configuration file" +msgstr "" + +#: src/modules/displaymanager/main.py:673 +msgid "LightDM config file {!s} does not exist" +msgstr "" + +#: src/modules/displaymanager/main.py:747 +msgid "Cannot configure LightDM" +msgstr "" + +#: src/modules/displaymanager/main.py:748 +msgid "No LightDM greeter installed." +msgstr "" + +#: src/modules/displaymanager/main.py:779 +msgid "Cannot write SLIM configuration file" +msgstr "" + +#: src/modules/displaymanager/main.py:780 +msgid "SLIM config file {!s} does not exist" +msgstr "" + +#: src/modules/displaymanager/main.py:906 +msgid "No display managers selected for the displaymanager module." +msgstr "" + +#: src/modules/displaymanager/main.py:907 +msgid "" +"The displaymanagers list is empty or undefined in both globalstorage and " +"displaymanager.conf." +msgstr "" + +#: src/modules/displaymanager/main.py:989 +msgid "Display manager configuration was incomplete" +msgstr "" + +#: src/modules/services-openrc/main.py:29 +msgid "Configure OpenRC services" +msgstr "" + +#: src/modules/services-openrc/main.py:57 +msgid "Cannot add service {name!s} to run-level {level!s}." +msgstr "" + +#: src/modules/services-openrc/main.py:59 +msgid "Cannot remove service {name!s} from run-level {level!s}." +msgstr "" + +#: src/modules/services-openrc/main.py:61 +msgid "" +"Unknown service-action {arg!s} for service {name!s} in run-" +"level {level!s}." +msgstr "" + +#: src/modules/services-openrc/main.py:93 +#: src/modules/services-systemd/main.py:59 +msgid "Cannot modify service" +msgstr "" + +#: src/modules/services-openrc/main.py:94 +msgid "" +"rc-update {arg!s} call in chroot returned error code {num!s}." +msgstr "" + +#: src/modules/services-openrc/main.py:101 +msgid "Target runlevel does not exist" +msgstr "" + +#: src/modules/services-openrc/main.py:102 +msgid "" +"The path for runlevel {level!s} is {path!s}, which does not " +"exist." +msgstr "" + +#: src/modules/services-openrc/main.py:110 +msgid "Target service does not exist" +msgstr "" + +#: src/modules/services-openrc/main.py:111 +msgid "" +"The path for service {name!s} is {path!s}, which does not " +"exist." +msgstr "" + +#: src/modules/networkcfg/main.py:29 +msgid "Saving network configuration." +msgstr "" + +#: src/modules/packages/main.py:50 src/modules/packages/main.py:59 +#: src/modules/packages/main.py:69 +msgid "Install packages." +msgstr "" + +#: src/modules/packages/main.py:57 +#, python-format +msgid "Processing packages (%(count)d / %(total)d)" +msgstr "" + +#: src/modules/packages/main.py:62 +#, python-format +msgid "Installing one package." +msgid_plural "Installing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:65 +#, python-format +msgid "Removing one package." +msgid_plural "Removing %(num)d packages." +msgstr[0] "" +msgstr[1] "" + +#: src/modules/packages/main.py:638 src/modules/packages/main.py:650 +#: src/modules/packages/main.py:678 +msgid "Package Manager error" +msgstr "" + +#: src/modules/packages/main.py:639 +msgid "" +"The package manager could not prepare updates. The command 
{!s}
" +"returned error code {!s}." +msgstr "" + +#: src/modules/packages/main.py:651 +msgid "" +"The package manager could not update the system. The command 
{!s}
" +" returned error code {!s}." +msgstr "" + +#: src/modules/packages/main.py:679 +msgid "" +"The package manager could not make changes to the installed system. The " +"command 
{!s}
returned error code {!s}." +msgstr "" + +#: src/modules/plymouthcfg/main.py:27 +msgid "Configure Plymouth theme" +msgstr "" + +#: src/modules/initcpiocfg/main.py:28 +msgid "Configuring mkinitcpio." +msgstr "" + +#: src/modules/localecfg/main.py:30 +msgid "Configuring locales." +msgstr "" + +#: src/modules/mount/main.py:30 +msgid "Mounting partitions." +msgstr "" + +#: src/modules/rawfs/main.py:26 +msgid "Installing data." +msgstr "" + +#: src/modules/dummypython/main.py:35 +msgid "Dummy python job." +msgstr "" + +#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93 +#: src/modules/dummypython/main.py:94 +msgid "Dummy python step {}" +msgstr "" + +#: src/modules/hwclock/main.py:26 +msgid "Setting hardware clock." +msgstr "" + +#: src/modules/umount/main.py:31 +msgid "Unmount file systems." +msgstr "" + +#: src/modules/openrcdmcryptcfg/main.py:26 +msgid "Configuring OpenRC dmcrypt service." +msgstr "" + +#: src/modules/services-systemd/main.py:26 +msgid "Configure systemd services" +msgstr "" + +#: src/modules/services-systemd/main.py:60 +msgid "" +"systemctl {arg!s} call in chroot returned error code {num!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:63 +#: src/modules/services-systemd/main.py:69 +msgid "Cannot enable systemd service {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:65 +msgid "Cannot enable systemd target {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:67 +msgid "Cannot enable systemd timer {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:71 +msgid "Cannot disable systemd target {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:73 +msgid "Cannot mask systemd unit {name!s}." +msgstr "" + +#: src/modules/services-systemd/main.py:75 +msgid "" +"Unknown systemd commands {command!s} and " +"{suffix!s} for unit {name!s}." +msgstr "" + +#: src/modules/mkinitfs/main.py:27 +msgid "Creating initramfs with mkinitfs." +msgstr "" + +#: src/modules/mkinitfs/main.py:49 +msgid "Failed to run mkinitfs on the target" +msgstr "" + +#: src/modules/unpackfs/main.py:34 +msgid "Filling up filesystems." +msgstr "" + +#: src/modules/unpackfs/main.py:254 +msgid "rsync failed with error code {}." +msgstr "" + +#: src/modules/unpackfs/main.py:299 +msgid "Unpacking image {}/{}, file {}/{}" +msgstr "" + +#: src/modules/unpackfs/main.py:314 +msgid "Starting to unpack {}" +msgstr "" + +#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:465 +msgid "Failed to unpack image \"{}\"" +msgstr "" + +#: src/modules/unpackfs/main.py:430 +msgid "No mount point for root partition" +msgstr "" + +#: src/modules/unpackfs/main.py:431 +msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing" +msgstr "" + +#: src/modules/unpackfs/main.py:436 +msgid "Bad mount point for root partition" +msgstr "" + +#: src/modules/unpackfs/main.py:437 +msgid "rootMountPoint is \"{}\", which does not exist, doing nothing" +msgstr "" + +#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457 +#: src/modules/unpackfs/main.py:463 src/modules/unpackfs/main.py:478 +msgid "Bad unsquash configuration" +msgstr "" + +#: src/modules/unpackfs/main.py:454 +msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel" +msgstr "" + +#: src/modules/unpackfs/main.py:458 +msgid "The source filesystem \"{}\" does not exist" +msgstr "" + +#: src/modules/unpackfs/main.py:464 +msgid "" +"Failed to find unsquashfs, make sure you have the squashfs-tools package " +"installed." +msgstr "" + +#: src/modules/unpackfs/main.py:479 +msgid "The destination \"{}\" in the target system is not a directory" +msgstr "" + +#: src/modules/luksopenswaphookcfg/main.py:26 +msgid "Configuring encrypted swap." +msgstr "" diff --git a/lang/python/vi/LC_MESSAGES/python.po b/lang/python/vi/LC_MESSAGES/python.po index 900b99454..8948806ae 100644 --- a/lang/python/vi/LC_MESSAGES/python.po +++ b/lang/python/vi/LC_MESSAGES/python.po @@ -5,7 +5,7 @@ # # Translators: # T. Tran , 2020 -# Th1nhhdk, 2021 +# th1nhhdk , 2021 # #, fuzzy msgid "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-11-02 15:45+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Th1nhhdk, 2021\n" +"Last-Translator: th1nhhdk , 2021\n" "Language-Team: Vietnamese (https://www.transifex.com/calamares/teams/20061/vi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" From 0145f6fe7dceeecf5c28784c4412a9a7cad0fdf7 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 18 Dec 2021 00:38:58 +0100 Subject: [PATCH 95/99] CMake: language stats --- CMakeLists.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 15f40803e..c8b233f50 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -135,15 +135,15 @@ set( CALAMARES_DESCRIPTION_SUMMARY # NOTE: update these lines by running `txstats.py`, or for full automation # `txstats.py -e`. See also # -# Total 81 languages -set( _tx_complete az az_AZ ca de fa fi_FI he hr ja ko lt pt_PT si - sq tr_TR uk zh_TW ) -set( _tx_good as be ca@valencia cs_CZ da fr fur hi it_IT ml nl - pt_BR ru sk sv tg vi zh_CN ) +# Total 74 languages +set( _tx_complete az az_AZ ca de fa fi_FI he hi hr ja ko lt pt_BR + pt_PT si sq sv tr_TR uk zh_TW ) +set( _tx_good as be ca@valencia cs_CZ da fr fur it_IT ml nl ru sk + tg vi zh_CN ) set( _tx_ok ar ast bg bn el en_GB es es_MX et eu gl hu id is mr nb pl ro sl sr sr@latin th ) -set( _tx_incomplete en_HK en_IN eo es_PE es_PR fr_CH gu hi_IN id_ID - ie kk kn ko_KR lo lv mk ne ne_NP te te_IN ur zh zh_HK ) +set( _tx_incomplete eo es_PR gu ie kk kn lo lv mk ne ne_NP ta_IN te + ur zh zh_HK ) ### Required versions # From da72e815dc7fb1c63c2211612ca9824f4eb307ea Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Sat, 18 Dec 2021 00:43:30 +0100 Subject: [PATCH 96/99] [luksopenswaphookcfg] Fix build, missing include --- src/modules/luksopenswaphookcfg/LOSHJob.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/luksopenswaphookcfg/LOSHJob.cpp b/src/modules/luksopenswaphookcfg/LOSHJob.cpp index 916ffcb8b..42f160460 100644 --- a/src/modules/luksopenswaphookcfg/LOSHJob.cpp +++ b/src/modules/luksopenswaphookcfg/LOSHJob.cpp @@ -19,6 +19,7 @@ #include #include +#include #include LOSHJob::LOSHJob( QObject* parent ) From 728315d3cc1e91edb35945ac6209b3f45ab633b7 Mon Sep 17 00:00:00 2001 From: demmm Date: Sun, 19 Dec 2021 12:54:39 +0100 Subject: [PATCH 97/99] README, link to actual GPL 3.0 license fixing https://github.com/calamares/calamares/issues/1859 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8fa2dfda7..c4c7a5e24 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ [![Current issue](https://img.shields.io/badge/issue-in_progress-FE9B48)](https://github.com/calamares/calamares/labels/hacking%3A%20in-progress) [![GitHub release](https://img.shields.io/github/release/calamares/calamares.svg)](https://github.com/calamares/calamares/releases) [![GitHub Build Status](https://img.shields.io/github/workflow/status/calamares/calamares/ci?label=GH%20build)](https://github.com/calamares/calamares/actions?query=workflow%3Aci) -[![GitHub license](https://img.shields.io/github/license/calamares/calamares.svg)](https://github.com/calamares/calamares/blob/calamares/LICENSE) +[![GitHub license](https://img.shields.io/github/license/calamares/calamares.svg)](https://github.com/calamares/calamares/blob/calamares/LICENSES/LGPL-3.0-or-later.txt) | [Report a Bug](https://github.com/calamares/calamares/issues/new) | [Translate](https://www.transifex.com/projects/p/calamares/) | [Contribute](CONTRIBUTING.md) | [Matrix: #calamares:kde.org](https://webchat.kde.org/#/room/%23calamares:kde.org) | [IRC: Libera.Chat #calamares](https://kiwiirc.com/client/irc.libera.chat/#calamares) | [Wiki](https://github.com/calamares/calamares/wiki) | From f0aba5db965d178c97717c843f61e3a1ffc081b6 Mon Sep 17 00:00:00 2001 From: dalto Date: Sun, 19 Dec 2021 15:29:42 -0600 Subject: [PATCH 98/99] Update modules readme for Python emergency modules support --- src/modules/README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/modules/README.md b/src/modules/README.md index 7b4d4b3a3..09696e66b 100644 --- a/src/modules/README.md +++ b/src/modules/README.md @@ -86,18 +86,18 @@ it needs those keys. ### Emergency Modules -Only C++ modules and job modules may be emergency modules. If, during an -*exec* step in the sequence, a module fails, installation as a whole fails -and the install is aborted. If there are emergency modules in the **same** -exec block, those will be executed before the installation is aborted. -Non-emergency modules are not executed. +If, during an *exec* step in the sequence, a module fails, installation as +a whole fails and the install is aborted. If there are emergency modules +in the **same** exec block, those will be executed before the installation +is aborted. Non-emergency modules are not executed. If an emergency-module fails while processing emergency-modules for another failed module, that failure is ignored and emergency-module processing continues. Use the EMERGENCY keyword in the CMake description of a C++ module -to generate a suitable `module.desc`. +to generate a suitable `module.desc`. For Python modules, manually add +`emergency: true` to `module.desc`. A module that is marked as an emergency module in its module.desc must **also** set the *emergency* key to *true* in its configuration file From 7864ab5cfaba8e59e35c65e7bec0953fc53c8d5b Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 21 Dec 2021 01:02:13 +0100 Subject: [PATCH 99/99] Docs: link to GPLv3+ --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c4c7a5e24..3e79d9a72 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ [![Current issue](https://img.shields.io/badge/issue-in_progress-FE9B48)](https://github.com/calamares/calamares/labels/hacking%3A%20in-progress) [![GitHub release](https://img.shields.io/github/release/calamares/calamares.svg)](https://github.com/calamares/calamares/releases) [![GitHub Build Status](https://img.shields.io/github/workflow/status/calamares/calamares/ci?label=GH%20build)](https://github.com/calamares/calamares/actions?query=workflow%3Aci) -[![GitHub license](https://img.shields.io/github/license/calamares/calamares.svg)](https://github.com/calamares/calamares/blob/calamares/LICENSES/LGPL-3.0-or-later.txt) +[![GitHub license](https://img.shields.io/github/license/calamares/calamares.svg)](https://github.com/calamares/calamares/blob/calamares/LICENSES/GPL-3.0-or-later.txt) | [Report a Bug](https://github.com/calamares/calamares/issues/new) | [Translate](https://www.transifex.com/projects/p/calamares/) | [Contribute](CONTRIBUTING.md) | [Matrix: #calamares:kde.org](https://webchat.kde.org/#/room/%23calamares:kde.org) | [IRC: Libera.Chat #calamares](https://kiwiirc.com/client/irc.libera.chat/#calamares) | [Wiki](https://github.com/calamares/calamares/wiki) |