Merge branch 'calamares' of https://github.com/calamares/calamares into development

CHANGES-3.2

+
 <!-- SPDX-FileCopyrightText: no
      SPDX-License-Identifier: CC0-1.0
 -->
@@ -7,13 +8,25 @@ 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.54 (unreleased) #
+# 3.2.55 (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.54 (2022-03-21) #
 
-This release contains contributions from (alphabetically by name):
- - Bob van der Linden
- - El-Wumbus
+This release contains contributions from (alphabetically):
+ - Bob van der Linden (new contributor! Welcome!)
+ - El-Wumbus (new contributor! Welcome!)
  - Evan James
- - Santosh Mahto
+ - Santosh Mahto (new contributor! Welcome!)
 
 ## Core ##
  - During the installation ("exec") step, while the slideshow is displayed,

CMakeLists.txt

@@ -41,7 +41,7 @@
 # TODO:3.3: Require CMake 3.12
 cmake_minimum_required( VERSION 3.3 FATAL_ERROR )
 project( CALAMARES
-    VERSION 3.2.54
+    VERSION 3.2.55
     LANGUAGES C CXX
 )
 

lang/python/az/LC_MESSAGES/python.po

@@ -4,7 +4,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# xxmn77 <xxmn77@gmail.com>, 2022
+# Xəyyam Qocayev <xxmn77@gmail.com>, 2022
 # 
 #, fuzzy
 msgid ""
@@ -13,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-02-17 15:52+0100\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: xxmn77 <xxmn77@gmail.com>, 2022\n"
+"Last-Translator: Xəyyam Qocayev <xxmn77@gmail.com>, 2022\n"
 "Language-Team: Azerbaijani (https://www.transifex.com/calamares/teams/20061/az/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

lang/python/az_AZ/LC_MESSAGES/python.po

@@ -4,7 +4,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# xxmn77 <xxmn77@gmail.com>, 2022
+# Xəyyam Qocayev <xxmn77@gmail.com>, 2022
 # 
 #, fuzzy
 msgid ""
@@ -13,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-02-17 15:52+0100\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: xxmn77 <xxmn77@gmail.com>, 2022\n"
+"Last-Translator: Xəyyam Qocayev <xxmn77@gmail.com>, 2022\n"
 "Language-Team: Azerbaijani (Azerbaijan) (https://www.transifex.com/calamares/teams/20061/az_AZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

lang/python/es/LC_MESSAGES/python.po

@@ -9,6 +9,7 @@
 # Adolfo Jayme-Barrientos, 2019
 # Miguel Mayol <mitcoes@gmail.com>, 2020
 # Pier Jose Gotta Perez <piegope@protonmail.com>, 2020
+# guillermo pacheco <guillopacheco@gmail.com>, 2022
 # 
 #, fuzzy
 msgid ""
@@ -17,7 +18,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-02-17 15:52+0100\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Pier Jose Gotta Perez <piegope@protonmail.com>, 2020\n"
+"Last-Translator: guillermo pacheco <guillopacheco@gmail.com>, 2022\n"
 "Language-Team: Spanish (https://www.transifex.com/calamares/teams/20061/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -63,16 +64,20 @@ msgstr "Instalar gestor de arranque."
 #: src/modules/bootloader/main.py:612
 msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
+"Error al instalar grub, no hay particiones definidas en el almacenamiento "
+"global"
 
 #: src/modules/bootloader/main.py:780
 msgid "Bootloader installation error"
-msgstr ""
+msgstr "Error de instalación del cargador de arranque"
 
 #: src/modules/bootloader/main.py:781
 msgid ""
 "The bootloader could not be installed. The installation command "
 "<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
+"No se pudo instalar el cargador de arranque. El comando de instalación "
+"<pre>{!s}</pre> devolvió el código de error {!s}."
 
 #: src/modules/fstab/main.py:29
 msgid "Writing fstab."
@@ -81,6 +86,8 @@ msgstr "Escribiendo la tabla de particiones fstab"
 #: src/modules/fstab/main.py:394
 msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
 msgstr ""
+"No se proporciona ninguna configuración de <pre>{!s}</pre> para "
+"que<pre>{!s}</pre> la use."
 
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
@@ -146,6 +153,8 @@ msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
 msgstr ""
+"La lista de gestores de pantalla está vacía o indefinida tanto en el "
+"globalstorage como en el displaymanager.conf."
 
 #: src/modules/displaymanager/main.py:1074
 msgid "Display manager configuration was incomplete"
@@ -241,25 +250,31 @@ msgstr[1] "Eliminando %(num)d paquetes."
 #: src/modules/packages/main.py:725 src/modules/packages/main.py:737
 #: src/modules/packages/main.py:765
 msgid "Package Manager error"
-msgstr ""
+msgstr "Error del Gestor de Paquetes"
 
 #: src/modules/packages/main.py:726
 msgid ""
 "The package manager could not prepare updates. The command <pre>{!s}</pre> "
 "returned error code {!s}."
 msgstr ""
+"El Gestor de Paquetes no pudo preparar actualizaciones. El comando "
+"<pre>{!s}</pre> devolvió el código de error {!s}."
 
 #: src/modules/packages/main.py:738
 msgid ""
 "The package manager could not update the system. The command <pre>{!s}</pre>"
 " returned error code {!s}."
 msgstr ""
+"El Gestor de Paquetes no pudo actualizar el sistema. El comando "
+"<pre>{!s}</pre> devolvió el código de error {!s}."
 
 #: src/modules/packages/main.py:766
 msgid ""
 "The package manager could not make changes to the installed system. The "
 "command <pre>{!s}</pre> returned error code {!s}."
 msgstr ""
+"El Gestor de Paquetes no pudo realizar cambios en el sistema instalado. El "
+"comando <pre>{!s}</pre> devolvió el código de error {!s}."
 
 #: src/modules/plymouthcfg/main.py:27
 msgid "Configure Plymouth theme"
@@ -279,23 +294,23 @@ msgstr "Montando particiones"
 
 #: src/modules/mount/main.py:88 src/modules/mount/main.py:124
 msgid "Internal error mounting zfs datasets"
-msgstr ""
+msgstr "Error interno al montar conjuntos de datos zfs"
 
 #: src/modules/mount/main.py:100
 msgid "Failed to import zpool"
-msgstr ""
+msgstr "Error al importar zpool"
 
 #: src/modules/mount/main.py:116
 msgid "Failed to unlock zpool"
-msgstr ""
+msgstr "Error al desbloquear zpool"
 
 #: src/modules/mount/main.py:133 src/modules/mount/main.py:138
 msgid "Failed to set zfs mountpoint"
-msgstr ""
+msgstr "Error al establecer el punto de montaje zfs"
 
 #: src/modules/mount/main.py:253
 msgid "zfs mounting error"
-msgstr ""
+msgstr "error de montaje zfs"
 
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
@@ -340,7 +355,7 @@ msgstr "No se puede activar el objetivo de systemd  <code>{name!s}</code>."
 
 #: src/modules/services-systemd/main.py:67
 msgid "Cannot enable systemd timer <code>{name!s}</code>."
-msgstr ""
+msgstr "No se puede habilitar el temporizador systemd <code>{name!s}</code>."
 
 #: src/modules/services-systemd/main.py:71
 msgid "Cannot disable systemd target <code>{name!s}</code>."
@@ -360,11 +375,11 @@ msgstr ""
 
 #: src/modules/mkinitfs/main.py:27
 msgid "Creating initramfs with mkinitfs."
-msgstr ""
+msgstr "Creando initramfs con mkinitfs."
 
 #: src/modules/mkinitfs/main.py:49
 msgid "Failed to run mkinitfs on the target"
-msgstr ""
+msgstr "Error al ejecutar mkinitfs en el objetivo"
 
 #: src/modules/unpackfs/main.py:34
 msgid "Filling up filesystems."
@@ -393,7 +408,7 @@ msgstr ""
 
 #: src/modules/unpackfs/main.py:431
 msgid "globalstorage does not contain a \"rootMountPoint\" key."
-msgstr ""
+msgstr "El globalstorage no contiene una llave \"rootMountPoint\"."
 
 #: src/modules/unpackfs/main.py:434
 msgid "Bad mount point for root partition"
@@ -401,17 +416,17 @@ msgstr "Punto de montaje no válido para una partición raíz,"
 
 #: src/modules/unpackfs/main.py:435
 msgid "rootMountPoint is \"{}\", which does not exist."
-msgstr ""
+msgstr "rootMountPoint es \"{}\", que no existe."
 
 #: src/modules/unpackfs/main.py:439 src/modules/unpackfs/main.py:455
 #: src/modules/unpackfs/main.py:459 src/modules/unpackfs/main.py:465
 #: src/modules/unpackfs/main.py:480
 msgid "Bad unpackfs configuration"
-msgstr ""
+msgstr "Mala configuración de unpackfs "
 
 #: src/modules/unpackfs/main.py:440
 msgid "There is no configuration information."
-msgstr ""
+msgstr "No hay información de configuración."
 
 #: src/modules/unpackfs/main.py:456
 msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
@@ -428,6 +443,8 @@ msgid ""
 "Failed to find unsquashfs, make sure you have the squashfs-tools package "
 "installed."
 msgstr ""
+"No se pudo encontrar unsquashfs, asegúrese de tener instalado el paquete "
+"squashfs-tools."
 
 #: src/modules/unpackfs/main.py:481
 msgid "The destination \"{}\" in the target system is not a directory"

lang/python/fi_FI/LC_MESSAGES/python.po

@@ -5,6 +5,7 @@
 # 
 # Translators:
 # Kimmo Kujansuu <mrkujansuu@gmail.com>, 2022
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2022
 # 
 #, fuzzy
 msgid ""
@@ -13,7 +14,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-02-17 15:52+0100\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Kimmo Kujansuu <mrkujansuu@gmail.com>, 2022\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>, 2022\n"
 "Language-Team: Finnish (Finland) (https://www.transifex.com/calamares/teams/20061/fi_FI/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,28 +54,28 @@ msgstr "Määritä GRUB."
 
 #: src/modules/bootloader/main.py:43
 msgid "Install bootloader."
-msgstr "Asenna bootloader."
+msgstr "Asenna käynnistyslatain."
 
 #: src/modules/bootloader/main.py:612
 msgid "Failed to install grub, no partitions defined in global storage"
 msgstr ""
-"Grub asennus epäonnistui, yleisessä levytilassa ei ole määritetty osioita"
+"Grubin asennus epäonnistui, yleisessä levytilassa ei ole määritetty osioita"
 
 #: src/modules/bootloader/main.py:780
 msgid "Bootloader installation error"
-msgstr "Bootloader asennusvirhe"
+msgstr "Käynnistyslataimen asennusvirhe"
 
 #: src/modules/bootloader/main.py:781
 msgid ""
 "The bootloader could not be installed. The installation command "
 "<pre>{!s}</pre> returned error code {!s}."
 msgstr ""
-"Bootloaderia ei voitu asentaa. Asennuskomento <pre>{!s}</pre> palautti "
+"Käynnistyslatainta ei voitu asentaa. Asennuskomento <pre>{!s}</pre> palautti"
 " virhekoodin {!s}."
 
 #: src/modules/fstab/main.py:29
 msgid "Writing fstab."
-msgstr "Fstab kirjoittaminen."
+msgstr "Kirjoitetaan fstabiin."
 
 #: src/modules/fstab/main.py:394
 msgid "No <pre>{!s}</pre> configuration is given for <pre>{!s}</pre> to use."
@@ -82,11 +83,11 @@ msgstr "Ei <pre>{!s}</pre> määritys annetaan <pre>{!s}</pre> varten."
 
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
-msgstr "Initramfs luominen dracut:lla."
+msgstr "Luodaan initramfs:ää dracutilla."
 
 #: src/modules/dracut/main.py:49
 msgid "Failed to run dracut on the target"
-msgstr "Dracut-ohjelman suorittaminen ei onnistunut"
+msgstr "Dracutin suorittaminen kohteessa ei onnistunut"
 
 #: src/modules/dracut/main.py:50 src/modules/mkinitfs/main.py:50
 msgid "The exit code was {}"
@@ -118,11 +119,11 @@ msgstr "LightDM-määritystiedostoa {!s} ei ole olemassa"
 
 #: src/modules/displaymanager/main.py:745
 msgid "Cannot configure LightDM"
-msgstr "LightDM määritysvirhe"
+msgstr "LightDM-määritysvirhe"
 
 #: src/modules/displaymanager/main.py:746
 msgid "No LightDM greeter installed."
-msgstr "LightDM ei ole asennettu."
+msgstr "LightDM:ää ei ole asennettu."
 
 #: src/modules/displaymanager/main.py:777
 msgid "Cannot write SLIM configuration file"
@@ -291,7 +292,7 @@ msgstr "Määritys zfs-liitospisteen epäonnistui"
 
 #: src/modules/mount/main.py:253
 msgid "zfs mounting error"
-msgstr "zfs asennusvirhe"
+msgstr "zfs-liitosvirhe"
 
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
@@ -316,7 +317,7 @@ msgstr "OpenRC dmcrypt-palvelun määrittäminen."
 
 #: src/modules/services-systemd/main.py:26
 msgid "Configure systemd services"
-msgstr "Määritä systemd palvelut"
+msgstr "Määritä systemd-palvelut"
 
 #: src/modules/services-systemd/main.py:60
 msgid ""
@@ -370,7 +371,7 @@ msgstr "rsync epäonnistui virhekoodilla {}."
 
 #: src/modules/unpackfs/main.py:299
 msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Kuvan purkaminen {}/{}, tiedosto {}/{}"
+msgstr "Puretaan levykuvaa {}/{}, tiedosto {}/{}"
 
 #: src/modules/unpackfs/main.py:314
 msgid "Starting to unpack {}"
@@ -378,11 +379,11 @@ msgstr "Pakkauksen purkaminen alkaa {}"
 
 #: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:467
 msgid "Failed to unpack image \"{}\""
-msgstr "Kuvan purkaminen epäonnistui \"{}\""
+msgstr "Levykuvan\"{}\" purkaminen epäonnistui"
 
 #: src/modules/unpackfs/main.py:430
 msgid "No mount point for root partition"
-msgstr "Ei liitospistettä root osiolle"
+msgstr "Ei liitospistettä juuriosiolle"
 
 #: src/modules/unpackfs/main.py:431
 msgid "globalstorage does not contain a \"rootMountPoint\" key."
@@ -390,7 +391,7 @@ msgstr "globalstorage ei sisällä \"rootMountPoint\"-avainta."
 
 #: src/modules/unpackfs/main.py:434
 msgid "Bad mount point for root partition"
-msgstr "Virheellinen liitospiste root osiolle"
+msgstr "Virheellinen liitospiste juuriosiolle"
 
 #: src/modules/unpackfs/main.py:435
 msgid "rootMountPoint is \"{}\", which does not exist."
@@ -400,7 +401,7 @@ msgstr "rootMountPoint on \"{}\", jota ei ole olemassa."
 #: src/modules/unpackfs/main.py:459 src/modules/unpackfs/main.py:465
 #: src/modules/unpackfs/main.py:480
 msgid "Bad unpackfs configuration"
-msgstr "Virheellinen unpacckfs määritys"
+msgstr "Virheellinen unpacckfs-määritys"
 
 #: src/modules/unpackfs/main.py:440
 msgid "There is no configuration information."

src/modules/partition/partition.conf

@@ -201,7 +201,7 @@ defaultFileSystemType:  "ext4"
 #       maxSize: 10G
 #       attributes: 0xffff000000000003
 #     - name: "home"
-#       type = "933ac7e1-2eb4-4f13-b844-0e14e2aef915"
+#       type: "933ac7e1-2eb4-4f13-b844-0e14e2aef915"
 #       filesystem: "ext4"
 #       mountPoint: "/home"
 #       size: 3G

src/modules/users/TestSetHostNameJob.cpp

@@ -23,6 +23,8 @@ extern bool setSystemdHostname( const QString& );
 #include <QTemporaryDir>
 #include <QtTest/QtTest>
 
+#include <unistd.h>
+
 class UsersTests : public QObject
 {
     Q_OBJECT
@@ -41,6 +43,7 @@ private Q_SLOTS:
 
 private:
     QTemporaryDir m_dir;
+    QString m_originalHostName;
 };
 
 UsersTests::UsersTests()
@@ -70,6 +73,15 @@ UsersTests::initTestCase()
         = Calamares::JobQueue::instance() ? Calamares::JobQueue::instance()->globalStorage() : nullptr;
     QVERIFY( gs );
     gs->insert( "rootMountPoint", m_dir.path() );
+
+    if ( m_originalHostName.isEmpty() )
+    {
+        QFile hostname( QStringLiteral( "/etc/hostname" ) );
+        if ( hostname.exists() && hostname.open( QIODevice::ReadOnly | QIODevice::Text ) )
+        {
+            m_originalHostName = hostname.readAll().trimmed();
+        }
+    }
 }
 
 void
@@ -113,9 +125,22 @@ UsersTests::testHostnamed()
 {
     // Since the service might not be running (e.g. non-systemd systems,
     // FreeBSD, docker, ..) we're not going to fail a test here.
-    // There's also the permissions problem to think of.
+    // There's also the permissions problem to think of. But if we're
+    // root, assume it will succeed.
+    if ( geteuid() != 0 )
+    {
         QEXPECT_FAIL( "", "Hostname changes are access-controlled", Continue );
-    QVERIFY( setSystemdHostname( "tubophone.calamares.io" ) );
+    }
+    QVERIFY( setSystemdHostname( QStringLiteral( "tubophone.calamares.io" ) ) );
+    if ( !m_originalHostName.isEmpty() )
+    {
+        // If the previous test succeeded (to change the hostname to something bogus)
+        // then this one should, also; or, if the previous one failed, then this
+        // changes to whatever-the-hostname-is, and systemd dbus seems to call that
+        // a success, as well (since nothing changes). So no failure-expectation here.
+        // QEXPECT_FAIL( "", "Hostname changes are access-controlled (restore)", Continue );
+        QVERIFY( setSystemdHostname( m_originalHostName ) );
+    }
 }