calamares: 3.3.3 -> 3.3.8

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001

From: Victor Fuentes <vmfuentes64@gmail.com>

Date: Thu, 1 Aug 2024 15:53:16 -0400

Subject: [PATCH] Modifies the users module to only set passwords of user and

 root

as the users will have already been created in the configuration.nix

file

---

 src/modules/users/Config.cpp | 15 ---------------

 1 file changed, 15 deletions(-)

diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp

index eedfd274d..0f3e78848 100644

index cd56bc3e2..9b09b36cd 100644

--- a/src/modules/users/Config.cpp

+++ b/src/modules/users/Config.cpp

@@ -972,26 +972,11 @@ Config::createJobs() const

@@ -1028,12 +1028,6 @@ Config::createJobs() const

     Calamares::Job* j;

-        jobs.append( Calamares::job_ptr( j ) );

-    }

-

     if ( getActiveDirectoryUsed() )

     {

         j = new ActiveDirectoryJob( m_activeDirectoryAdminUsername,

@@ -1043,20 +1037,11 @@ Config::createJobs() const

         jobs.append( Calamares::job_ptr( j ) );

     }

-    j = new SetupGroupsJob( this );

-    jobs.append( Calamares::job_ptr( j ) );

-

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001

From: Victor Fuentes <vmfuentes64@gmail.com>

Date: Thu, 1 Aug 2024 15:57:55 -0400

Subject: [PATCH] Makes calamares search

 /run/current-system/sw/share/calamares/ for extra configuration files as by

 default it only searches /usr/share/calamares/ and

 /nix/store/<hash>-calamares-<version>/share/calamares/ but

 calamares-nixos-extensions is not in either of these locations

---

 src/calamares/main.cpp          | 1 +

 src/libcalamares/utils/Dirs.cpp | 8 ++++++++

 src/libcalamares/utils/Dirs.h   | 3 +++

 3 files changed, 12 insertions(+)

diff --git a/src/calamares/main.cpp b/src/calamares/main.cpp

index e0491e5f9..faf272016 100644

--- a/src/calamares/main.cpp

     if ( !is_debug )

     {

diff --git a/src/libcalamares/utils/Dirs.cpp b/src/libcalamares/utils/Dirs.cpp

index c42768a08..bac98645a 100644

index c42768a08..dfce7eb5d 100644

--- a/src/libcalamares/utils/Dirs.cpp

+++ b/src/libcalamares/utils/Dirs.cpp

@@ -114,6 +114,14 @@ setXdgDirs()

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001

From: Victor Fuentes <vmfuentes64@gmail.com>

Date: Thu, 1 Aug 2024 15:59:54 -0400

Subject: [PATCH] Uses pkexec within modules in order to run calamares without

 root permissions as a whole.

Also fixes storage check in the welcome module

---

 src/libcalamares/utils/Runner.cpp             |  8 +++---

 src/modules/mount/main.py                     |  8 +++---

 .../welcome/checker/GeneralRequirements.cpp   | 27 ++++++++++++++++++-

 .../welcome/checker/GeneralRequirements.h     |  1 +

 4 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/src/libcalamares/utils/Runner.cpp b/src/libcalamares/utils/Runner.cpp

index 632f32028..fe9052449 100644

index f7872a7d0..a246ca110 100644

--- a/src/libcalamares/utils/Runner.cpp

+++ b/src/libcalamares/utils/Runner.cpp

@@ -137,13 +137,13 @@ Calamares::Utils::Runner::run()

@@ -145,13 +145,13 @@ Calamares::Utils::Runner::run()

     }

     if ( m_location == RunLocation::RunInTarget )

     {

     if ( m_output )

diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py

index 4202639f3..de2556b91 100644

index 4a16f8872..6d32916a5 100644

--- a/src/modules/mount/main.py

+++ b/src/modules/mount/main.py

@@ -235,7 +235,8 @@ def mount_partition(root_mount_point, partition, partitions, mount_options, moun

@@ -244,7 +244,7 @@ def mount_partition(root_mount_point, partition, partitions, mount_options, moun

     # Ensure that the created directory has the correct SELinux context on

     # SELinux-enabled systems.

-    os.makedirs(mount_point, exist_ok=True)

+    subprocess.check_call(["pkexec", "mkdir", "-p", mount_point])

+

     try:

         subprocess.call(['chcon', '--reference=' + raw_mount_point, mount_point])

     except FileNotFoundError as e:

@@ -278,13 +279,13 @@ def mount_partition(root_mount_point, partition, partitions, mount_options, moun

@@ -288,13 +288,13 @@ def mount_partition(root_mount_point, partition, partitions, mount_options, moun

         for s in btrfs_subvolumes:

             if not s["subvolume"]:

                 continue

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001

From: Victor Fuentes <vmfuentes64@gmail.com>

Date: Thu, 1 Aug 2024 16:00:43 -0400

Subject: [PATCH] Adds unfree qml to packagechooserq

---

 .../packagechooserq/packagechooserq.qrc       |  1 +

 .../packagechooserq@unfree.qml                | 75 +++++++++++++++++++

 src/modules/packagechooserq/unfree.conf       | 11 +++

 3 files changed, 87 insertions(+)

 create mode 100644 src/modules/packagechooserq/packagechooserq@unfree.qml

 create mode 100644 src/modules/packagechooserq/unfree.conf

diff --git a/src/modules/packagechooserq/packagechooserq.qrc b/src/modules/packagechooserq/packagechooserq.qrc

index 1b892dce1..ee80a934b 100644

--- a/src/modules/packagechooserq/packagechooserq.qrc

 </RCC>

diff --git a/src/modules/packagechooserq/packagechooserq@unfree.qml b/src/modules/packagechooserq/packagechooserq@unfree.qml

new file mode 100644

index 000000000..cb87d864a

index 000000000..5e36d77d9

--- /dev/null

+++ b/src/modules/packagechooserq/packagechooserq@unfree.qml

@@ -0,0 +1,75 @@

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001

From: Victor Fuentes <vmfuentes64@gmail.com>

Date: Thu, 1 Aug 2024 16:01:53 -0400

Subject: [PATCH] Modifies finished module to add some NixOS resources.

Modifies packagechooser module to change the UI.

---

 src/modules/finished/FinishedPage.cpp         | 12 +++++---

 .../packagechooser/PackageChooserPage.cpp     |  1 +

 src/modules/packagechooser/page_package.ui    | 28 +++++++++----------

 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/modules/finished/FinishedPage.cpp b/src/modules/finished/FinishedPage.cpp

index 23cb194c4..8714937f6 100644

index 51be52678..307607232 100644

--- a/src/modules/finished/FinishedPage.cpp

+++ b/src/modules/finished/FinishedPage.cpp

@@ -74,7 +74,10 @@ FinishedPage::retranslate()

@@ -74,8 +74,10 @@ FinishedPage::retranslate()

         {

             ui->mainText->setText( tr( "<h1>All done.</h1><br/>"

                                        "%1 has been set up on your computer.<br/>"

-                                       "You may now start using your new system.", "@info" )

-                                       "You may now start using your new system.",

-                                       "@info" )

+                                       "You may now start using your new system.<br/>"

+                                       "You can change every setting later except the bootloader.<br/>"

+                                       "Check the <a href=\"https://nixos.org/manual/nixos/stable/\">manual</a> for instructions on how to install software, upgrade the system or enable services.<br/>"

                                        .arg( branding->versionedName() ) );

             ui->restartCheckBox->setToolTip( tr( "<html><head/><body>"

                                                  "<p>When this box is checked, your system will "

@@ -87,7 +90,10 @@ FinishedPage::retranslate()

@@ -89,8 +91,10 @@ FinishedPage::retranslate()

             ui->mainText->setText( tr( "<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.", "@info" )

-                                       "using the %2 Live environment.",

-                                       "@info" )

+                                       "using the %2 Live environment.<br/>"

+                                       "You can change every setting later except the bootloader.<br/>"

+                                       "Check the <a href=\"https://nixos.org/manual/nixos/stable/\">manual</a> for instructions on how to install software, upgrade the system or enable services.<br/>"