From f3c2580c0eab906892dabf99b55f60a30231c34d Mon Sep 17 00:00:00 2001
From: Ward from fusion-voyager-3 <hotrod.master@hotmail.com>
Date: Mon, 26 Aug 2024 01:11:03 +0300
Subject: [PATCH] try fixing autoscroll & and failure on auto parting when
 parts are mounted

---
 .github/release-nest-v3                       |  2 +-
 debian/changelog                              |  2 +-
 src/installation_progress_page/mod.rs         |  2 +-
 .../script_gen/auto_basic.rs                  | 27 +++++++++++++++----
 .../script_gen/auto_btrfs.rs                  | 12 ++++-----
 .../script_gen/auto_ext4.rs                   |  8 +++---
 .../script_gen/auto_xfs.rs                    |  8 +++---
 7 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/.github/release-nest-v3 b/.github/release-nest-v3
index e440e5c..bf0d87a 100644
--- a/.github/release-nest-v3
+++ b/.github/release-nest-v3
@@ -1 +1 @@
-3
\ No newline at end of file
+4
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 7dc4c51..894f60a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pika-installer-gtk4 (2.0.0-101pika2) pika; urgency=low
+pika-installer-gtk4 (2.0.0-101pika3) pika; urgency=low
 
   * First Release of new installer
 
diff --git a/src/installation_progress_page/mod.rs b/src/installation_progress_page/mod.rs
index 29667cf..3fd9fbb 100644
--- a/src/installation_progress_page/mod.rs
+++ b/src/installation_progress_page/mod.rs
@@ -125,7 +125,7 @@ pub fn installation_progress_page(
         installation_progress_log_scroll,
         move |_|
             {
-                if installation_progress_log_scroll.vadjustment().upper() - installation_progress_log_scroll.vadjustment().value() < (installation_progress_log_scroll.size(gtk::Orientation::Vertical) as f64 * 1.2 ) {
+                if installation_progress_log_scroll.vadjustment().upper() - installation_progress_log_scroll.vadjustment().value() < (installation_progress_log_scroll.size(gtk::Orientation::Vertical) as f64 * 1.35 ) {
                     installation_progress_log_scroll.vadjustment().set_value(installation_progress_log_scroll.vadjustment().upper())
                 }
             }
diff --git a/src/installation_summary_page/script_gen/auto_basic.rs b/src/installation_summary_page/script_gen/auto_basic.rs
index 8855e9f..ebbe55c 100644
--- a/src/installation_summary_page/script_gen/auto_basic.rs
+++ b/src/installation_summary_page/script_gen/auto_basic.rs
@@ -4,13 +4,30 @@ echo 'PARTING' | nc -U $SOCKET_PATH || true
 
 PIKA_INSTALL_AUTO_TARGET_DISK={AUTO_INSTALL_TARGET_DISK}
 
-for part in $(/usr/lib/pika/pika-installer-gtk4/scripts/partition-utility.sh get_partitions | grep "$PIKA_INSTALL_AUTO_TARGET_DISK"); do
-	PARTITION="/dev/$part"
-	swapoff $PARTITION || true
-done
+# Unmount host partitions from chroot
+umount "$PIKA_INSTALL_CHROOT_PATH/media/cdrom" || umount -lf "$PIKA_INSTALL_CHROOT_PATH/media/cdrom" || true
+umount "$PIKA_INSTALL_CHROOT_PATH/dev" || umount -lf "$PIKA_INSTALL_CHROOT_PATH/dev" || true
+umount "$PIKA_INSTALL_CHROOT_PATH/run" || umount -lf "$PIKA_INSTALL_CHROOT_PATH/run" || true
+umount "$PIKA_INSTALL_CHROOT_PATH/proc" || umount -lf "$PIKA_INSTALL_CHROOT_PATH/proc" || true
+umount "$PIKA_INSTALL_CHROOT_PATH/sys" || umount -lf "$PIKA_INSTALL_CHROOT_PATH/sys" || true
+
+if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme"
+then
+	for part in $(/usr/lib/pika/pika-installer-gtk4/scripts/partition-utility.sh get_partitions | grep "$PIKA_INSTALL_AUTO_TARGET_DISK")p; do
+		PARTITION="/dev/$part"
+		swapoff $PARTITION || true
+		umount -l $PARTITION || true
+	done
+else
+	for part in $(/usr/lib/pika/pika-installer-gtk4/scripts/partition-utility.sh get_partitions | grep "$PIKA_INSTALL_AUTO_TARGET_DISK"); do
+		PARTITION="/dev/$part"
+		swapoff $PARTITION || true
+		umount -l $PARTITION || true
+	done
+fi
 
 wipefs -af /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
-blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
+blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" || systemctl restart systemd-udevd.service
 
 "###;
 
diff --git a/src/installation_summary_page/script_gen/auto_btrfs.rs b/src/installation_summary_page/script_gen/auto_btrfs.rs
index ddc1882..36cf2f3 100644
--- a/src/installation_summary_page/script_gen/auto_btrfs.rs
+++ b/src/installation_summary_page/script_gen/auto_btrfs.rs
@@ -6,7 +6,7 @@ mkpart "linux-boot" 500Mib 1500Mib \
 mkpart "linux-root" 1500Mib  100%Mib \
 print
 
-blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
+blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" || systemctl restart systemd-udevd.service
 
 if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme"
 then
@@ -68,7 +68,7 @@ mkpart "linux-boot" 500Mib 1500Mib \
 mkpart "linux-root" 1500Mib  100%Mib \
 print
 
-blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
+blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" || systemctl restart systemd-udevd.service
 
 # add p to partition if it's nvme
 if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme"
@@ -137,7 +137,7 @@ mkpart "linux-root" 1500Mib  "$PIKA_INSTALL_AUTO_ROOT_SIZE"Mib \
 mkpart "linux-home" "$PIKA_INSTALL_AUTO_ROOT_SIZE"Mib  100% \
 print
 
-blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
+blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" || systemctl restart systemd-udevd.service
 
 if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme"
 then
@@ -209,7 +209,7 @@ mkpart "linux-root" 1500Mib  "$PIKA_INSTALL_AUTO_ROOT_SIZE"Mib \
 mkpart "linux-home" "$PIKA_INSTALL_AUTO_ROOT_SIZE"Mib  100% \
 print
 
-blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
+blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" || systemctl restart systemd-udevd.service
 
 # add p to partition if it's nvme
 if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme"
@@ -287,7 +287,7 @@ mkpart "linux-boot" 500Mib 1500Mib \
 mkpart "linux-root" 1500Mib  100%Mib \
 print
 
-blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
+blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" || systemctl restart systemd-udevd.service
 
 if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme"
 then
@@ -343,7 +343,7 @@ mkpart "linux-boot" 500Mib 1500Mib \
 mkpart "linux-root" 1500Mib  100%Mib \
 print
 
-blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
+blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" || systemctl restart systemd-udevd.service
 
 # add p to partition if it's nvme
 if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme"
diff --git a/src/installation_summary_page/script_gen/auto_ext4.rs b/src/installation_summary_page/script_gen/auto_ext4.rs
index cb1f670..3a93faa 100644
--- a/src/installation_summary_page/script_gen/auto_ext4.rs
+++ b/src/installation_summary_page/script_gen/auto_ext4.rs
@@ -10,7 +10,7 @@ mkpart "linux-root" 1500Mib  "$PIKA_INSTALL_AUTO_ROOT_SIZE"Mib \
 mkpart "linux-home" "$PIKA_INSTALL_AUTO_ROOT_SIZE"Mib  100% \
 print
 
-blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
+blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" || systemctl restart systemd-udevd.service
 
 if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme"
 then
@@ -66,7 +66,7 @@ mkpart "linux-root" 1500Mib  "$PIKA_INSTALL_AUTO_ROOT_SIZE"Mib \
 mkpart "linux-home" "$PIKA_INSTALL_AUTO_ROOT_SIZE"Mib  100% \
 print
 
-blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
+blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" || systemctl restart systemd-udevd.service
 
 # add p to partition if it's nvme
 if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme"
@@ -128,7 +128,7 @@ mkpart "linux-boot" 500Mib 1500Mib \
 mkpart "linux-root" 1500Mib  100%Mib \
 print
 
-blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
+blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" || systemctl restart systemd-udevd.service
 
 if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme"
 then
@@ -176,7 +176,7 @@ mkpart "linux-boot" 500Mib 1500Mib \
 mkpart "linux-root" 1500Mib  100%Mib \
 print
 
-blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
+blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" || systemctl restart systemd-udevd.service
 
 # add p to partition if it's nvme
 if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme"
diff --git a/src/installation_summary_page/script_gen/auto_xfs.rs b/src/installation_summary_page/script_gen/auto_xfs.rs
index 42e017f..c9808dc 100644
--- a/src/installation_summary_page/script_gen/auto_xfs.rs
+++ b/src/installation_summary_page/script_gen/auto_xfs.rs
@@ -11,7 +11,7 @@ mkpart "linux-root" 1500Mib  "$PIKA_INSTALL_AUTO_ROOT_SIZE"Mib \
 mkpart "linux-home" "$PIKA_INSTALL_AUTO_ROOT_SIZE"Mib  100% \
 print
 
-blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
+blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" || systemctl restart systemd-udevd.service
 
 if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme"
 then
@@ -67,7 +67,7 @@ mkpart "linux-root" 1500Mib  "$PIKA_INSTALL_AUTO_ROOT_SIZE"Mib \
 mkpart "linux-home" "$PIKA_INSTALL_AUTO_ROOT_SIZE"Mib  100% \
 print
 
-blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
+blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" || systemctl restart systemd-udevd.service
 
 # add p to partition if it's nvme
 if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme"
@@ -129,7 +129,7 @@ mkpart "linux-boot" 500Mib 1500Mib \
 mkpart "linux-root" 1500Mib  100%Mib \
 print
 
-blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
+blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" || systemctl restart systemd-udevd.service
 
 if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme"
 then
@@ -177,7 +177,7 @@ mkpart "linux-boot" 500Mib 1500Mib \
 mkpart "linux-root" 1500Mib  100%Mib \
 print
 
-blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
+blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK" || systemctl restart systemd-udevd.service
 
 # add p to partition if it's nvme
 if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme"