From 3bfd2d7139f268340ff2526525e2fd8cfcbb0b77 Mon Sep 17 00:00:00 2001
From: Ward from fusion-voyager-3 <hotrod.master@hotmail.com>
Date: Sat, 24 Aug 2024 01:55:15 +0300
Subject: [PATCH] Fix problem :P

---
 src/installation_progress_page/auto_basic.rs   |  2 +-
 src/installation_progress_page/auto_btrfs.rs   | 12 ++++++------
 src/installation_progress_page/auto_ext4.rs    |  8 ++++----
 src/installation_progress_page/auto_xfs.rs     |  8 ++++----
 src/installation_progress_page/manual_basic.rs |  6 +++---
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/installation_progress_page/auto_basic.rs b/src/installation_progress_page/auto_basic.rs
index a9942be..d6fefd6 100644
--- a/src/installation_progress_page/auto_basic.rs
+++ b/src/installation_progress_page/auto_basic.rs
@@ -10,7 +10,7 @@ for part in $(/usr/lib/pika/pika-installer-gtk4/scripts/partition-utility.sh get
 done
 
 wipefs -af /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
-blockdev --rereadpt "$PIKA_INSTALL_AUTO_TARGET_DISK"
+blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
 
 "###;
 
diff --git a/src/installation_progress_page/auto_btrfs.rs b/src/installation_progress_page/auto_btrfs.rs
index 2fff8a4..f7d879a 100644
--- a/src/installation_progress_page/auto_btrfs.rs
+++ b/src/installation_progress_page/auto_btrfs.rs
@@ -6,7 +6,7 @@ mkpart "linux-boot" 500Mib 1500Mib \
 mkpart "linux-root" 1500Mib  100%Mib \
 print
 
-blockdev --rereadpt "$PIKA_INSTALL_AUTO_TARGET_DISK"
+blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
 
 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 "$PIKA_INSTALL_AUTO_TARGET_DISK"
+blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
 
 # 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 "$PIKA_INSTALL_AUTO_TARGET_DISK"
+blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
 
 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 "$PIKA_INSTALL_AUTO_TARGET_DISK"
+blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
 
 # 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 "$PIKA_INSTALL_AUTO_TARGET_DISK"
+blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
 
 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 "$PIKA_INSTALL_AUTO_TARGET_DISK"
+blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
 
 # add p to partition if it's nvme
 if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme"
diff --git a/src/installation_progress_page/auto_ext4.rs b/src/installation_progress_page/auto_ext4.rs
index 0896ff2..d7548cd 100644
--- a/src/installation_progress_page/auto_ext4.rs
+++ b/src/installation_progress_page/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 "$PIKA_INSTALL_AUTO_TARGET_DISK"
+blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
 
 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 "$PIKA_INSTALL_AUTO_TARGET_DISK"
+blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
 
 # 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 "$PIKA_INSTALL_AUTO_TARGET_DISK"
+blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
 
 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 "$PIKA_INSTALL_AUTO_TARGET_DISK"
+blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
 
 # add p to partition if it's nvme
 if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme"
diff --git a/src/installation_progress_page/auto_xfs.rs b/src/installation_progress_page/auto_xfs.rs
index b0f0a5d..2ec3a1b 100644
--- a/src/installation_progress_page/auto_xfs.rs
+++ b/src/installation_progress_page/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 "$PIKA_INSTALL_AUTO_TARGET_DISK"
+blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
 
 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 "$PIKA_INSTALL_AUTO_TARGET_DISK"
+blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
 
 # 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 "$PIKA_INSTALL_AUTO_TARGET_DISK"
+blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
 
 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 "$PIKA_INSTALL_AUTO_TARGET_DISK"
+blockdev --rereadpt /dev/"$PIKA_INSTALL_AUTO_TARGET_DISK"
 
 # add p to partition if it's nvme
 if echo "$PIKA_INSTALL_AUTO_TARGET_DISK" | grep -i "nvme"
diff --git a/src/installation_progress_page/manual_basic.rs b/src/installation_progress_page/manual_basic.rs
index 1af278e..4eac8ba 100644
--- a/src/installation_progress_page/manual_basic.rs
+++ b/src/installation_progress_page/manual_basic.rs
@@ -1,18 +1,18 @@
 pub const manual_partition_mount_prog: &str = r###"
 
 mkdir -p "$PIKA_INSTALL_CHROOT_PATH"'{MOUNTPOINT}'
-mount {PART} "$PIKA_INSTALL_CHROOT_PATH"'{MOUNTPOINT}'
+mount /dev/{PART} "$PIKA_INSTALL_CHROOT_PATH"'{MOUNTPOINT}'
 "###;
 
 pub const manual_partition_mount_with_opts_prog: &str = r###"
 
 mkdir -p "$PIKA_INSTALL_CHROOT_PATH"'{MOUNTPOINT}'
-mount -o '{OPTS}' '{PART}' "$PIKA_INSTALL_CHROOT_PATH"'{MOUNTPOINT}'
+mount -o '{OPTS}' /dev/'{PART}' "$PIKA_INSTALL_CHROOT_PATH"'{MOUNTPOINT}'
 "###;
 
 pub const manual_swap_mount_prog: &str = r###"
 
-echo '{PART}' >> /tmp/pika-installer-gtk4-swaplist
+echo /dev/'{PART}' >> /tmp/pika-installer-gtk4-swaplist
 "###;
 
 pub const manual_crypt_entry: &str = r###"