From 0ed0d37693df03785e86bb8e500b327bc88d6724 Mon Sep 17 00:00:00 2001 From: Chrysostomus Date: Sat, 5 Dec 2020 22:55:35 +0200 Subject: [PATCH 1/6] Don't use plymouth-encrypt if there is keyfile in use, because it is buggy and asks for password even when it is not needed --- src/modules/initcpiocfg/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/initcpiocfg/main.py b/src/modules/initcpiocfg/main.py index 0ccffbf56..2b999f46c 100644 --- a/src/modules/initcpiocfg/main.py +++ b/src/modules/initcpiocfg/main.py @@ -153,7 +153,7 @@ def modify_mkinitcpio_conf(partitions, root_mount_point): hooks.append("usr") if encrypt_hook: - if detect_plymouth(): + if detect_plymouth() and unencrypted_separate_boot(): hooks.append("plymouth-encrypt") else: hooks.append("encrypt") From 59cfdcccdf82acf04d88f761b6bd89490ad13ef0 Mon Sep 17 00:00:00 2001 From: Chrysostomus Date: Sat, 5 Dec 2020 22:57:51 +0200 Subject: [PATCH 2/6] Use variable instead of a function --- src/modules/initcpiocfg/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/initcpiocfg/main.py b/src/modules/initcpiocfg/main.py index 2b999f46c..cdfeadd0f 100644 --- a/src/modules/initcpiocfg/main.py +++ b/src/modules/initcpiocfg/main.py @@ -153,7 +153,7 @@ def modify_mkinitcpio_conf(partitions, root_mount_point): hooks.append("usr") if encrypt_hook: - if detect_plymouth() and unencrypted_separate_boot(): + if detect_plymouth() and unencrypted_separate_boot: hooks.append("plymouth-encrypt") else: hooks.append("encrypt") From 205fc4f948fb0d9ac211fca97723be8046170eee Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 7 Dec 2020 14:24:45 +0100 Subject: [PATCH 3/6] Changes: pre-release housekeeping --- CHANGES | 11 +++++++---- CMakeLists.txt | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index 290d12a41..84b9e3937 100644 --- a/CHANGES +++ b/CHANGES @@ -7,16 +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.36 (unreleased) # +# 3.2.35.1 (2020-12-07) # This release contains contributions from (alphabetically by first name): - Anubhav Choudhary + - Matti Hyttinen -## Core ## - - No core changes yet +Some strange string artifacts appeared, leading to `{1?}` being +displayed in various user-facing messages. These have been removed +and the translations updated. ## Modules ## - - No module changes yet + - The *initcpiocfg* module would sometimes configure the system to ask + for a passphrase, when none is needed. # 3.2.35 (2020-11-30) # diff --git a/CMakeLists.txt b/CMakeLists.txt index 976823805..c7c59a201 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.36 + VERSION 3.2.35.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 ### OPTIONS # From a299b9dd3adf5276e16e88f1ddd1890b6d1d973b Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Mon, 7 Dec 2020 16:51:33 +0100 Subject: [PATCH 4/6] i18n: [calamares] Automatic merge of Transifex translations --- lang/calamares_en.ts | 2 +- lang/calamares_he.ts | 14 +++++++------- lang/calamares_lt.ts | 2 +- lang/calamares_pt_PT.ts | 12 ++++++------ 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lang/calamares_en.ts b/lang/calamares_en.ts index 2ff1968eb..fc66795b3 100644 --- a/lang/calamares_en.ts +++ b/lang/calamares_en.ts @@ -1036,7 +1036,7 @@ The installer will quit and all changes will be lost. Creating user %1 - Creating user %1. + Creating user %1 diff --git a/lang/calamares_he.ts b/lang/calamares_he.ts index 671739498..17bdc44d1 100644 --- a/lang/calamares_he.ts +++ b/lang/calamares_he.ts @@ -569,7 +569,7 @@ The installer will quit and all changes will be lost. The EFI system partition at %1 will be used for starting %2. - מחיצת מערכת ה־EFI שב־%1 תשמש עבור טעינת %2. + מחיצת מערכת EFI שב־%1 תשמש לטעינת %2. @@ -1040,7 +1040,7 @@ The installer will quit and all changes will be lost. Creating user %1 - המשתמש %1 נוצר. + המשתמש %1 נוצר @@ -1184,7 +1184,7 @@ The installer will quit and all changes will be lost. Skip writing LUKS configuration for Dracut: "/" partition is not encrypted - דלג רישום הגדרות הצפנה LUKS עבור Dracut: מחיצת "/" לא תוצפן. + דילוג על רישום הגדרת LUKS עבור Dracut: מחיצת "/" אינה מוצפנת @@ -1322,7 +1322,7 @@ The installer will quit and all changes will be lost. Setting up mount points. - נקודות עיגון מוגדרות. + כעת בהגדרת נקודות העיגון. @@ -1411,7 +1411,7 @@ The installer will quit and all changes will be lost. Formatting partition %1 with file system %2. - מאתחל מחיצה %1 עם מערכת קבצים %2. + כעת בפרמוט המחיצה %1 עם מערכת הקבצים %2. @@ -3251,7 +3251,7 @@ Output: Setting hostname %1. - שם העמדה %1 מוגדר. + כעת בהגדרת שם המארח %1. @@ -3389,7 +3389,7 @@ Output: Setting password for user %1. - מגדיר סיסמה עבור משתמש %1. + כעת בהגדרת הסיסמה למשתמש %1. diff --git a/lang/calamares_lt.ts b/lang/calamares_lt.ts index af818ae9a..76b151dfd 100644 --- a/lang/calamares_lt.ts +++ b/lang/calamares_lt.ts @@ -1040,7 +1040,7 @@ Diegimo programa užbaigs darbą ir visi pakeitimai bus prarasti. Creating user %1 - Kuriamas naudotojas %1. + Kuriamas naudotojas %1 diff --git a/lang/calamares_pt_PT.ts b/lang/calamares_pt_PT.ts index b2603de7c..acaa2103b 100644 --- a/lang/calamares_pt_PT.ts +++ b/lang/calamares_pt_PT.ts @@ -1030,18 +1030,18 @@ O instalador será encerrado e todas as alterações serão perdidas. Preserving home directory - + A preservar o directório da pasta pessoal Creating user %1 - + A criar utilizador %1 Configuring user %1 - + A configurar o utilizador %1 @@ -1527,7 +1527,7 @@ O instalador será encerrado e todas as alterações serão perdidas. Creating initramfs with mkinitcpio. - + A criar o initramfs com o mkinitcpio. @@ -1808,7 +1808,7 @@ O instalador será encerrado e todas as alterações serão perdidas. Timezone: %1 - + Fuso horário: %1 @@ -1968,7 +1968,7 @@ O instalador será encerrado e todas as alterações serão perdidas. Timezone: %1 - + Fuso horário: %1 From b98886cdc245e8fa7f432c46de9ae1d542fd53f4 Mon Sep 17 00:00:00 2001 From: Calamares CI Date: Mon, 7 Dec 2020 16:51:34 +0100 Subject: [PATCH 5/6] i18n: [python] Automatic merge of Transifex translations --- lang/python/pt_PT/LC_MESSAGES/python.po | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lang/python/pt_PT/LC_MESSAGES/python.po b/lang/python/pt_PT/LC_MESSAGES/python.po index 2fac605f4..0948b0b3f 100644 --- a/lang/python/pt_PT/LC_MESSAGES/python.po +++ b/lang/python/pt_PT/LC_MESSAGES/python.po @@ -5,8 +5,8 @@ # # Translators: # Nuno Amorim , 2018 -# Hugo Carvalho , 2019 # Ricardo Simões , 2020 +# Hugo Carvalho , 2020 # #, fuzzy msgid "" @@ -15,7 +15,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-12-04 22:26+0100\n" "PO-Revision-Date: 2017-08-09 10:34+0000\n" -"Last-Translator: Ricardo Simões , 2020\n" +"Last-Translator: Hugo Carvalho , 2020\n" "Language-Team: Portuguese (Portugal) (https://www.transifex.com/calamares/teams/20061/pt_PT/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -208,6 +208,8 @@ msgid "" "The displaymanagers list is empty or undefined in both globalstorage and " "displaymanager.conf." msgstr "" +"A lista de gestores de visualização está vazia ou indefinida tanto no " +"globalstorage como no displaymanager.conf." #: src/modules/displaymanager/main.py:977 msgid "Display manager configuration was incomplete" @@ -323,11 +325,11 @@ msgstr "A definir o relógio do hardware." #: src/modules/mkinitfs/main.py:27 msgid "Creating initramfs with mkinitfs." -msgstr "" +msgstr "A criar o initramfs com o mkinitfs." #: src/modules/mkinitfs/main.py:49 msgid "Failed to run mkinitfs on the target" -msgstr "" +msgstr "Falha ao executar o mkintfs no destino" #: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50 msgid "The exit code was {}" From b7a27b3f9ff307d854e3f60e52ea32fcc0b96106 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 9 Dec 2020 11:35:42 +0100 Subject: [PATCH 6/6] Changes: post-release housekeeping --- CHANGES | 12 ++++++++++++ CMakeLists.txt | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 84b9e3937..b3bf7f53d 100644 --- a/CHANGES +++ b/CHANGES @@ -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.36 (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.35.1 (2020-12-07) # This release contains contributions from (alphabetically by first name): diff --git a/CMakeLists.txt b/CMakeLists.txt index c7c59a201..976823805 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.35.1 + VERSION 3.2.36 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 ### OPTIONS #