From 162cdced75ff091fc5b69634e12513cfcbbee867 Mon Sep 17 00:00:00 2001
From: lw520203 <1823363429@qq.com>
Date: Thu, 13 Feb 2025 00:16:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=A3=81=E7=9B=98=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=A3=80=E6=B5=8B&&=E9=A6=96=E9=A1=B5=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 0015-requireDiskScan.patch | 55 ++++++++++++++++++++++++++++++++++++++
 calamares.spec             |  6 ++++-
 2 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 0015-requireDiskScan.patch

diff --git a/0015-requireDiskScan.patch b/0015-requireDiskScan.patch
new file mode 100644
index 0000000..5940543
--- /dev/null
+++ b/0015-requireDiskScan.patch
@@ -0,0 +1,55 @@
+From c8c11d780cccabc463d2005ea28453df115f37bf Mon Sep 17 00:00:00 2001
+From: lw520203 <1823363429@qq.com>
+Date: Thu, 13 Feb 2025 00:03:51 +0800
+Subject: [PATCH] =?UTF-8?q?=E6=AC=A2=E8=BF=8E=E9=A1=B5=E7=B3=BB=E7=BB=9F?=
+ =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
+ =?UTF-8?q?=E4=BF=AE=E8=AE=A2?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ src/modules/partition/core/DeviceList.cpp | 2 +-
+ src/modules/welcome/WelcomePage.cpp       | 5 ++++-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/modules/partition/core/DeviceList.cpp b/src/modules/partition/core/DeviceList.cpp
+index 188594963..666bb1833 100644
+--- a/src/modules/partition/core/DeviceList.cpp
++++ b/src/modules/partition/core/DeviceList.cpp
+@@ -49,7 +49,7 @@ hasRootPartition( Device* device )
+ static bool
+ isValidDevice(const QString& devicePath)
+ {
+-    auto result = Calamares::System::runCommand({ "blkid", devicePath }, std::chrono::seconds(30));
++    auto result = Calamares::System::runCommand({ "lsblk" }, std::chrono::seconds(30));
+ 
+     return result.getExitCode() == 0 && !result.getOutput().isEmpty();
+ }
+diff --git a/src/modules/welcome/WelcomePage.cpp b/src/modules/welcome/WelcomePage.cpp
+index 88f38c256..bbbda8f68 100644
+--- a/src/modules/welcome/WelcomePage.cpp
++++ b/src/modules/welcome/WelcomePage.cpp
+@@ -27,6 +27,7 @@
+ #include "utils/Logger.h"
+ #include "utils/NamedEnum.h"
+ #include "utils/Retranslator.h"
++#include "utils/System.h"
+ 
+ #include <QApplication>
+ #include <QBoxLayout>
+@@ -211,8 +212,10 @@ void
+ WelcomePage::retranslate()
+ {
+     const QString message = m_conf->genericWelcomeMessage();
++    auto rse = Calamares::System::runCommand({"cat", "/etc/os-release"}, std::chrono::seconds(30));
++    QString osVersion = rse.getOutput().split("PRETTY_NAME=\"")[1].split("\"\n")[0].replace(" ", "-");
+ 
+-    ui->mainText->setText( message.arg( Calamares::Branding::instance()->versionedName() ) );
++    ui->mainText->setText( message.arg(osVersion) );
+     ui->retranslateUi( this );
+     // ui->supportButton->setText(
+     //     tr( "%1 Support", "@action" ).arg( Calamares::Branding::instance()->shortProductName() ) );
+-- 
+2.46.0
+
diff --git a/calamares.spec b/calamares.spec
index e98811f..96d669f 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -2,7 +2,7 @@
 
 Name:           calamares
 Version:        3.3.7
-Release:        3
+Release:        4
 Summary:        Installer from a live CD/DVD/USB to disk
 
 License:        GPL-3.0-or-later
@@ -56,6 +56,7 @@ Patch10:        0011-fix-87-position-and-translate.patch
 Patch11:        0012-replace-icon.patch
 Patch12:	    0013-1230.patch
 Patch13:        0014-setRepoSource.patch
+Patch14:        0015-requireDiskScan.patch
 
 # Calamares is only supported where live images (and GRUB) are. (#1171380)
 # This list matches the arches where grub2-efi is used to boot the system
@@ -348,6 +349,9 @@ cd %{_builddir} || exit 0
 rm -rf %{buildroot}
 
 %changelog
+* Mon Feb 17 2025 Liu Wang <1823363429@qq.com> - 3.3.7-4
+- Require disk scan and welcome page version show
+
 * Wed Jan 15 2025 Liu Wang <1823363429@qq.com> - 3.3.7-3
 - Select repo source by image type
 
-- 
Gitee


From 5ee6cc3ae54720d5f6df5155d5b8106be3b33c5a Mon Sep 17 00:00:00 2001
From: lizixin <2271170409@qq.com>
Date: Thu, 27 Feb 2025 15:44:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0calamares.service?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 calamares.service | 1 +
 calamares.spec    | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/calamares.service b/calamares.service
index 774f3f1..66d648c 100644
--- a/calamares.service
+++ b/calamares.service
@@ -6,6 +6,7 @@ After=basic.target
 [Service]
 Type=simple
 ExecStartPre=/sbin/multipath -F
+ExecStartPre=/usr/sbin/partprobe
 ExecStart=/usr/bin/calamares -style Adwaita
 Restart=on-abort
 
diff --git a/calamares.spec b/calamares.spec
index 96d669f..b6d198b 100644
--- a/calamares.spec
+++ b/calamares.spec
@@ -2,7 +2,7 @@
 
 Name:           calamares
 Version:        3.3.7
-Release:        4
+Release:        5
 Summary:        Installer from a live CD/DVD/USB to disk
 
 License:        GPL-3.0-or-later
@@ -349,6 +349,9 @@ cd %{_builddir} || exit 0
 rm -rf %{buildroot}
 
 %changelog
+* Thu Feb 27 2025 Li Zixin <2271170409@qq.com> - 3.3.7-5
+- Update calamares.service 
+
 * Mon Feb 17 2025 Liu Wang <1823363429@qq.com> - 3.3.7-4
 - Require disk scan and welcome page version show
 
-- 
Gitee