Lubuntu/calamares-packaging
4
0
Fork 0
mirror of https://git.launchpad.net/~ubuntu-qt-code/ubuntu/+source/calamares/+git/calamares synced 2025-07-27 17:31:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sync with the archive.

Browse Source
This commit is contained in:
Simon Quigley 2024-02-29 10:33:42 -06:00
parent 1a617cfc3b
commit 5ce0d92ac2
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
calamares (3.3.4-0ubuntu1) noble; urgency=medium
* New upstream release.
* Refresh patches.
-- Simon Quigley <tsimonq2@ubuntu.com> Mon, 26 Feb 2024 19:04:30 -0600
calamares (3.3.3-0ubuntu1) noble; urgency=medium calamares (3.3.3-0ubuntu1) noble; urgency=medium
* New upstream release. * New upstream release.

38
debian/patches/enable-only-present-with-encryption-partitions.patch vendored
View File

@ -2,12 +2,10 @@ Description: Allow specifying partitions that are only present when FDE is used.
Author: Aaron Rainbolt <arraybolt3@ubuntu.com> Author: Aaron Rainbolt <arraybolt3@ubuntu.com>
Origin: ubuntu Origin: ubuntu
Forwarded: not-needed Forwarded: not-needed
Last-Update: 2024-02-06 Last-Update: 2024-02-26
Index: calamares-3.3.1/src/modules/partition/core/PartitionLayout.cpp --- a/src/modules/partition/core/PartitionLayout.cpp
=================================================================== +++ b/src/modules/partition/core/PartitionLayout.cpp
--- calamares-3.3.1.orig/src/modules/partition/core/PartitionLayout.cpp
+++ calamares-3.3.1/src/modules/partition/core/PartitionLayout.cpp
@@ -62,6 +62,7 @@ PartitionLayout::PartitionEntry::Partiti @@ -62,6 +62,7 @@ PartitionLayout::PartitionEntry::Partiti
const QString& mountPoint, const QString& mountPoint,
const QString& fs, const QString& fs,
@ -16,14 +14,14 @@ Index: calamares-3.3.1/src/modules/partition/core/PartitionLayout.cpp
const QVariantMap& features, const QVariantMap& features,
const QString& size, const QString& size,
const QString& minSize, const QString& minSize,
@@ -78,6 +79,7 @@ PartitionLayout::PartitionEntry::Partiti @@ -72,6 +73,7 @@ PartitionLayout::PartitionEntry::Partiti
{ , partAttributes( attributes )
PartUtils::canonicalFilesystemName( fs, &partFileSystem ); , partMountPoint( mountPoint )
partNoEncrypt = noEncrypt; , partNoEncrypt( noEncrypt )
+ partOnlyPresentWithEncryption = onlyPresentWithEncryption; + , partOnlyPresentWithEncryption ( onlyPresentWithEncryption )
} , partFeatures( features )
, partSize( size )
bool , partMinSize( minSize )
@@ -119,6 +121,7 @@ PartitionLayout::init( FileSystem::Type @@ -119,6 +121,7 @@ PartitionLayout::init( FileSystem::Type
Calamares::getString( pentry, "mountPoint" ), Calamares::getString( pentry, "mountPoint" ),
Calamares::getString( pentry, "filesystem", "unformatted" ), Calamares::getString( pentry, "filesystem", "unformatted" ),
@ -76,14 +74,12 @@ Index: calamares-3.3.1/src/modules/partition/core/PartitionLayout.cpp
// Adjust partition size based on available space. // Adjust partition size based on available space.
qint64 sectors = partSectorsMap.value( &entry ); qint64 sectors = partSectorsMap.value( &entry );
sectors = std::min( sectors, availableSectors ); sectors = std::min( sectors, availableSectors );
Index: calamares-3.3.1/src/modules/partition/core/PartitionLayout.h --- a/src/modules/partition/core/PartitionLayout.h
=================================================================== +++ b/src/modules/partition/core/PartitionLayout.h
--- calamares-3.3.1.orig/src/modules/partition/core/PartitionLayout.h
+++ calamares-3.3.1/src/modules/partition/core/PartitionLayout.h
@@ -38,6 +38,7 @@ public: @@ -38,6 +38,7 @@ public:
QString partMountPoint; QString partMountPoint;
FileSystem::Type partFileSystem = FileSystem::Unknown; FileSystem::Type partFileSystem = FileSystem::Unknown;
bool partNoEncrypt; bool partNoEncrypt = false;
+ bool partOnlyPresentWithEncryption; + bool partOnlyPresentWithEncryption;
QVariantMap partFeatures; QVariantMap partFeatures;
Calamares::Partition::PartitionSize partSize; Calamares::Partition::PartitionSize partSize;
@ -96,10 +92,8 @@ Index: calamares-3.3.1/src/modules/partition/core/PartitionLayout.h
const QVariantMap& features, const QVariantMap& features,
const QString& size, const QString& size,
const QString& minSize = QString(), const QString& minSize = QString(),
Index: calamares-3.3.1/src/modules/partition/partition.conf --- a/src/modules/partition/partition.conf
=================================================================== +++ b/src/modules/partition/partition.conf
--- calamares-3.3.1.orig/src/modules/partition/partition.conf
+++ calamares-3.3.1/src/modules/partition/partition.conf
@@ -259,6 +259,7 @@ defaultFileSystemType: "ext4" @@ -259,6 +259,7 @@ defaultFileSystemType: "ext4"
# type: "4f68bce3-e8cd-4db1-96e7-fbcaf984b709" # type: "4f68bce3-e8cd-4db1-96e7-fbcaf984b709"
# filesystem: "ext4" # filesystem: "ext4"